[pkg-java] r8013 - in trunk/lucene2/debian: . patches

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2009-02-26 19:59:49 +0000 (Thu, 26 Feb 2009)
New Revision: 8013

Added:
   trunk/lucene2/debian/patches/90_fix-invalid-tests.dpatch
Modified:
   trunk/lucene2/debian/changelog
   trunk/lucene2/debian/patches/00list
Log:
Remove two invalid tests also removed upstream


Modified: trunk/lucene2/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog	2009-02-25 20:34:10 UTC (rev 8012)
+++ trunk/lucene2/debian/changelog	2009-02-26 19:59:49 UTC (rev 8013)
@@ -5,8 +5,9 @@
   * Added ${misc:Depends} dependencies to fix possible debhelper dependencies.
   * Cleaned up package description of liblucene2-java (removed list of contrib
     libraries)
+  * Removed two invalid tests also removed upstream (Closes: #516475).
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 06 Feb 2009 10:52:58 +0100
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Thu, 26 Feb 2009 20:57:33 +0100
 
 lucene2 (2.4.0+ds1-2) unstable; urgency=low
 

Modified: trunk/lucene2/debian/patches/00list
===================================================================
--- trunk/lucene2/debian/patches/00list	2009-02-25 20:34:10 UTC (rev 8012)
+++ trunk/lucene2/debian/patches/00list	2009-02-26 19:59:49 UTC (rev 8013)
@@ -8,3 +8,4 @@
 61_lucli-script.dpatch
 70_fix-contrib-regex-libs.dpatch
 80_prevent-downloading-data-files.dpatch
+90_fix-invalid-tests.dpatch

Added: trunk/lucene2/debian/patches/90_fix-invalid-tests.dpatch
===================================================================
--- trunk/lucene2/debian/patches/90_fix-invalid-tests.dpatch	                        (rev 0)
+++ trunk/lucene2/debian/patches/90_fix-invalid-tests.dpatch	2009-02-26 19:59:49 UTC (rev 8013)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_fix-invalid-tests.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream also has this patch (revision 731727), with the comment
+## DP: "remove 2 invalid tests of modified utf8 null byte". See 
+## DP: also the discussion at
+## DP: http://mail-archives.apache.org/mod_mbox/lucene-java-dev/200901.mbox/%3CEF6C8235-660E-4EC9-A1E6-A7270916BABF@mikemccandless.com%3E
+
+ at DPATCH@
+diff -urNad lucene2~/src/test/org/apache/lucene/index/TestIndexInput.java lucene2/src/test/org/apache/lucene/index/TestIndexInput.java
+--- lucene2~/src/test/org/apache/lucene/index/TestIndexInput.java	2008-10-01 13:58:22.000000000 +0200
++++ lucene2/src/test/org/apache/lucene/index/TestIndexInput.java	2009-02-26 20:54:41.000000000 +0100
+@@ -59,12 +59,6 @@
+       0x01, 0x00,
+       0x08, 'L', 'u', 0x00, 'c', 'e', 0x00, 'n', 'e',
+       
+-      // Modified UTF-8 null bytes
+-      0x02, (byte) 0xC0, (byte) 0x80,
+-      0x0A, 'L', 'u', (byte) 0xC0, (byte) 0x80, 
+-            'c', 'e', (byte) 0xC0, (byte) 0x80, 
+-            'n', 'e',
+-
+     });
+         
+     assertEquals(128,is.readVInt());
+@@ -85,9 +79,6 @@
+     
+     assertEquals("\u0000",is.readString());
+     assertEquals("Lu\u0000ce\u0000ne",is.readString());
+-
+-    assertEquals("\u0000",is.readString());
+-    assertEquals("Lu\u0000ce\u0000ne",is.readString());
+   }
+ 
+   /**


Property changes on: trunk/lucene2/debian/patches/90_fix-invalid-tests.dpatch
___________________________________________________________________
Name: svn:executable
   + *