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

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2008-09-23 18:12:46 +0000 (Tue, 23 Sep 2008)
New Revision: 7037

Modified:
   trunk/lucene2/debian/ant.properties
   trunk/lucene2/debian/changelog
   trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch
   trunk/lucene2/debian/patches/81_prevent-network-access.dpatch
Log:
Updates for Lucene 2.4.0-rc1

Modified: trunk/lucene2/debian/ant.properties
===================================================================
--- trunk/lucene2/debian/ant.properties	2008-09-23 11:48:09 UTC (rev 7036)
+++ trunk/lucene2/debian/ant.properties	2008-09-23 18:12:46 UTC (rev 7037)
@@ -2,7 +2,7 @@
 
 # Version number for upstream source; errors in the 
 # upstream source require that it be overridden.
-version=2.3.2
+version=2.4.0-rc1
 
 # javacc settings used by Lucene build
 javacc.home=/usr/share/java

Modified: trunk/lucene2/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog	2008-09-23 11:48:09 UTC (rev 7036)
+++ trunk/lucene2/debian/changelog	2008-09-23 18:12:46 UTC (rev 7037)
@@ -1,8 +1,9 @@
-lucene2 (2.3.2+ds1-2) UNRELEASED; urgency=low
+lucene2 (2.4.0-rc1+ds1-1) UNRELEASED; urgency=low
 
+  * New upstream version (2 patches patched)
   * Add DM-Upload-Allowed: Yes to debian/control
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Mon, 08 Sep 2008 10:26:32 +0200
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 23 Sep 2008 19:25:33 +0200
 
 lucene2 (2.3.2+ds1-1) unstable; urgency=low
 

Modified: trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch	2008-09-23 11:48:09 UTC (rev 7036)
+++ trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch	2008-09-23 18:12:46 UTC (rev 7037)
@@ -9,7 +9,7 @@
 diff -urNad lucene2-2.3.0~/contrib/benchmark/build.xml lucene2-2.3.0/contrib/benchmark/build.xml
 --- lucene2-2.3.0~/contrib/benchmark/build.xml	2008-01-26 15:45:55.000000000 +0530
 +++ lucene2-2.3.0/contrib/benchmark/build.xml	2008-01-26 15:55:12.000000000 +0530
-@@ -99,22 +99,22 @@
+@@ -100,23 +100,23 @@
          <antcall target="expand-reuters"/>
          <antcall target="extract-reuters"/>
      </target>
@@ -29,12 +29,13 @@
      <path id="classpath">
          <pathelement path="${common.dir}/build/classes/java"/>
          <pathelement path="${common.dir}/build/classes/demo"/>
--        <pathelement path="${basedir}/lib/${digester.jar}"/>
--        <pathelement path="${basedir}/lib/${collections.jar}"/>
--        <pathelement path="${basedir}/lib/${logging.jar}"/>
--        <pathelement path="${basedir}/lib/${bean-utils.jar}"/>
--        <pathelement path="${basedir}/lib/${xercesImpl.jar}"/>
--        <pathelement path="${basedir}/lib/${xml-apis.jar}"/>
+         <pathelement path="${common.dir}/build/contrib/highlighter/classes/java"/>
+-        <pathelement path="lib/${digester.jar}"/>
+-        <pathelement path="lib/${collections.jar}"/>
+-        <pathelement path="lib/${logging.jar}"/>
+-        <pathelement path="lib/${bean-utils.jar}"/>
+-        <pathelement path="lib/${xercesImpl.jar}"/>
+-        <pathelement path="lib/${xml-apis.jar}"/>
 +        <pathelement path="/usr/share/java/${digester.jar}"/>
 +        <pathelement path="/usr/share/java/${collections.jar}"/>
 +        <pathelement path="/usr/share/java/${logging.jar}"/>

Modified: trunk/lucene2/debian/patches/81_prevent-network-access.dpatch
===================================================================
--- trunk/lucene2/debian/patches/81_prevent-network-access.dpatch	2008-09-23 11:48:09 UTC (rev 7036)
+++ trunk/lucene2/debian/patches/81_prevent-network-access.dpatch	2008-09-23 18:12:46 UTC (rev 7037)
@@ -8,22 +8,22 @@
 
 @DPATCH@
 diff -urNad lucene2~/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java lucene2/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
---- lucene2~/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java	2008-01-21 02:29:36.000000000 +0100
-+++ lucene2/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java	2008-02-01 14:15:45.000000000 +0100
-@@ -449,6 +449,8 @@
- 	 * Demonstrates creation of an XHTML compliant doc using new encoding facilities.
- 	 * @throws Exception
- 	 */
+--- lucene2~/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java	2008-09-18 19:03:28.000000000 +0200
++++ lucene2/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java	2008-09-23 17:31:55.000000000 +0200
+@@ -975,6 +975,8 @@
+    * 
+    * @throws Exception
+    */
 +
-+        /* Disabled for Debian packaging, causes network access during builds 
- 	public void testEncoding() throws Exception
-     {
-         String rawDocContent = "\"Smith & sons' prices < 3 and >4\" claims article";
-@@ -499,6 +501,7 @@
-         String decodedSnippet=h2.getFirstChild().getNodeValue();
-         assertEquals("XHTML Encoding should have worked:", rawDocContent,decodedSnippet);
-     }
-+    */
++  /* Disabled for Debian packaging, causes network access during builds
+   public void testEncoding() throws Exception {
  
- 	public void testMultiSearcher() throws Exception
- 	{
+     String rawDocContent = "\"Smith & sons' prices < 3 and >4\" claims article";
+@@ -1014,6 +1016,7 @@
+     String decodedSnippet = h2.getFirstChild().getNodeValue();
+     assertEquals("XHTML Encoding should have worked:", rawDocContent, decodedSnippet);
+   }
++  */
+ 
+   public void testMultiSearcher() throws Exception {
+     // setup index 1