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

Jan-Pascal van Best janpascal-guest at alioth.debian.org
Wed Aug 11 11:08:32 UTC 2010


Author: janpascal-guest
Date: 2010-08-11 11:08:30 +0000 (Wed, 11 Aug 2010)
New Revision: 12903

Modified:
   trunk/lucene2/debian/ant.properties
   trunk/lucene2/debian/changelog
   trunk/lucene2/debian/control
   trunk/lucene2/debian/get-orig-source.sh
   trunk/lucene2/debian/patches/00list
   trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch
   trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch
   trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch
   trunk/lucene2/debian/patches/80_prevent-downloading-data-files.dpatch
   trunk/lucene2/debian/patches/82_disable-svnversion-calls.dpatch
   trunk/lucene2/debian/rules
   trunk/lucene2/debian/watch
Log:
Fixes for lucene 2.9.3

Modified: trunk/lucene2/debian/ant.properties
===================================================================
--- trunk/lucene2/debian/ant.properties	2010-08-10 22:00:17 UTC (rev 12902)
+++ trunk/lucene2/debian/ant.properties	2010-08-11 11:08:30 UTC (rev 12903)
@@ -2,7 +2,7 @@
 
 # Version number for upstream source; errors in the 
 # upstream source require that it be overridden.
-version=2.9.2
+version=2.9.3
 
 # javacc settings used by Lucene build
 javacc.home=/usr/share/java

Modified: trunk/lucene2/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog	2010-08-10 22:00:17 UTC (rev 12902)
+++ trunk/lucene2/debian/changelog	2010-08-11 11:08:30 UTC (rev 12903)
@@ -1,3 +1,11 @@
+lucene2 (2.9.3+ds1-1) unstable; urgency=low
+
+  * New upstream release 2.9.3
+  * Bump standards version to 3.9.0 (no changes needed)
+  * Added OSGI Require-Bundle metadata in contrib libraries (Closes: #578196)
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 06 Aug 2010 16:14:31 +0200
+
 lucene2 (2.9.2+ds1-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/lucene2/debian/control
===================================================================
--- trunk/lucene2/debian/control	2010-08-10 22:00:17 UTC (rev 12902)
+++ trunk/lucene2/debian/control	2010-08-11 11:08:30 UTC (rev 12903)
@@ -10,7 +10,7 @@
 Homepage: http://lucene.apache.org/java/
 Build-Depends: cdbs (>= 0.4.49), debhelper (>= 6), dpatch (>= 2.0),
  openjdk-6-jdk, 
- ant-optional, javacc, junit
+ ant-optional (>= 1.8), ant-contrib, javacc, junit
 Build-Depends-Indep: libjline-java (>= 0.9.5), 
  libcommons-digester-java (>= 1.7), 
  libregexp-java (>= 1.4), 
@@ -22,7 +22,7 @@
  libcommons-compress-java (>= 1.0),
  libicu4j-java (>= 3.8.1),
  libjtidy-java (>= 7+svn20070309)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 
 Package: liblucene2-java
 Architecture: all

Modified: trunk/lucene2/debian/get-orig-source.sh
===================================================================
--- trunk/lucene2/debian/get-orig-source.sh	2010-08-10 22:00:17 UTC (rev 12902)
+++ trunk/lucene2/debian/get-orig-source.sh	2010-08-11 11:08:30 UTC (rev 12903)
@@ -1,11 +1,9 @@
 #!/bin/bash
 
-#DEHS=`( uscan --dehs )`
+DEHS=`( uscan --dehs )`
 
-#URL=`echo $DEHS | xsltproc debian/uscan-url.xslt -`
-#VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -`
-VERSION="2.9.2"
-URL="http://www.apache.org/dist/lucene/java/lucene-2.9.2-src.tar.gz"
+URL=`echo $DEHS | xsltproc debian/uscan-url.xslt -`
+VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -`
 
 DEBIAN_SOURCE_VERSION="$VERSION+ds1"
 

Modified: trunk/lucene2/debian/patches/00list
===================================================================
--- trunk/lucene2/debian/patches/00list	2010-08-10 22:00:17 UTC (rev 12902)
+++ trunk/lucene2/debian/patches/00list	2010-08-11 11:08:30 UTC (rev 12903)
@@ -8,12 +8,12 @@
 31_fix-contrib-ant-test-wrong-encoding.dpatch
 40_fix-contrib-benchmark-libs.dpatch
 45_fix-contrib-collation-libs.dpatch
-50_fix-contrib-db-libs.dpatch
-55_fix-contrib-db-je-libs.dpatch
+50_fix-contrib-db-libs
+55_fix-contrib-db-je-libs
 60_fix-contrib-lucli-libs.dpatch
 61_lucli-script.dpatch
 70_fix-contrib-regex-libs.dpatch
-80_prevent-downloading-data-files.dpatch
+80_prevent-downloading-data-files
 81_disable-test-tag-backcompat-tests.dpatch
-82_disable-svnversion-calls.dpatch
+82_disable-svnversion-calls
 83_fix-java-IPv4-networking.dpatch

Modified: trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch
===================================================================
--- trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch	2010-08-10 22:00:17 UTC (rev 12902)
+++ trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch	2010-08-11 11:08:30 UTC (rev 12903)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad lucene2~/build.xml lucene2/build.xml
---- lucene2~/build.xml	2010-01-23 20:26:27.000000000 +0100
-+++ lucene2/build.xml	2010-01-23 20:26:30.000000000 +0100
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/build.xml lucene2/build.xml
+--- lucene2~/build.xml	2010-08-06 13:44:30.000000000 +0200
++++ lucene2/build.xml	2010-08-06 13:44:32.000000000 +0200
 @@ -21,6 +21,16 @@
  
    <property name="junit.includes" value="**/Test*.java"/>
@@ -25,10 +25,35 @@
    <import file="common-build.xml"/>
  
    <property name="build.demo.template" value="src/demo/demo-build.template"/> 
-diff -urNad lucene2~/common-build.xml lucene2/common-build.xml
---- lucene2~/common-build.xml	2010-01-23 20:26:27.000000000 +0100
-+++ lucene2/common-build.xml	2010-01-23 20:26:30.000000000 +0100
-@@ -313,6 +313,29 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/common-build.xml lucene2/common-build.xml
+--- lucene2~/common-build.xml	2010-08-06 13:44:30.000000000 +0200
++++ lucene2/common-build.xml	2010-08-06 13:46:16.000000000 +0200
+@@ -23,6 +23,8 @@
+     for standalone use.
+   </description>
+ 
++  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
++
+   <dirname file="${ant.file.common}" property="common.dir"/>
+ 
+   <!-- Give user a chance to override without editing this file
+@@ -291,6 +293,15 @@
+   </macrodef>  	
+ 	
+ 	
++  <macrodef name="update-manifest-requirebundle" 
++            description="Updates the Require-Bundle attribute of a manifest file">
++    <sequential>
++      <manifest file="${manifest.file}" mode="update">
++                <attribute name="Require-Bundle"
++                           value="${OSGi.requirebundle}"/>
++      </manifest>
++    </sequential>
++  </macrodef>
+ 	
+   <macrodef name="build-manifest" description="Builds a manifest file">
+   	<attribute name="title" default="Lucene Search Engine: ${ant.project.name}" />
+@@ -311,6 +322,24 @@
  		           value="${javac.source}"/>
  		<attribute name="X-Compile-Target-JDK" 
  		           value="${javac.target}"/>
@@ -36,11 +61,6 @@
 +                           value="2"/>
 +                <attribute name="Bundle-SymbolicName"
 +                           value="${OSGi.symbolicname}"/>
-+                           <!-- Not needed for core, I do not know how to
-+                           conditionally disable this
-+                <attribute name="Require-Bundle"
-+                           value="${OSGi.requirebundle}"/>
-+                           -->
 +                <attribute name="Bundle-Name"
 +                           value="@{title}"/>
 +                <attribute name="Bundle-Version"
@@ -58,9 +78,22 @@
  	  </manifest>
    	</sequential>
    </macrodef>
-diff -urNad lucene2~/contrib/analyzers/common/build.xml lucene2/contrib/analyzers/common/build.xml
---- lucene2~/contrib/analyzers/common/build.xml	2010-01-23 20:26:27.000000000 +0100
-+++ lucene2/contrib/analyzers/common/build.xml	2010-01-23 20:26:30.000000000 +0100
+@@ -328,6 +357,12 @@
+       </exec>
+       
+       <build-manifest/>
++      <if>
++        <isset property="OSGi.requirebundle"/>
++        <then>
++          <update-manifest-requirebundle/>
++        </then>
++      </if>
+     	
+       <jar
+         destfile="@{destfile}"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/analyzers/common/build.xml lucene2/contrib/analyzers/common/build.xml
+--- lucene2~/contrib/analyzers/common/build.xml	2010-08-06 13:44:30.000000000 +0200
++++ lucene2/contrib/analyzers/common/build.xml	2010-08-06 13:44:32.000000000 +0200
 @@ -30,8 +30,18 @@
    <property name="dist.dir" location="../../../dist/contrib/analyzers/common" />
    <property name="maven.dist.dir" location="../../../dist/maven" />
@@ -81,9 +114,9 @@
    <path id="test.classpath">
      <path refid="classpath"/>
      <pathelement location="../../../build/classes/test/"/>
-diff -urNad lucene2~/contrib/analyzers/smartcn/build.xml lucene2/contrib/analyzers/smartcn/build.xml
---- lucene2~/contrib/analyzers/smartcn/build.xml	2010-01-23 20:26:27.000000000 +0100
-+++ lucene2/contrib/analyzers/smartcn/build.xml	2010-01-23 20:26:59.000000000 +0100
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/analyzers/smartcn/build.xml lucene2/contrib/analyzers/smartcn/build.xml
+--- lucene2~/contrib/analyzers/smartcn/build.xml	2010-08-06 13:44:30.000000000 +0200
++++ lucene2/contrib/analyzers/smartcn/build.xml	2010-08-06 13:44:32.000000000 +0200
 @@ -30,6 +30,15 @@
    <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" />
    <property name="maven.dist.dir" location="../../../dist/maven" />
@@ -100,9 +133,9 @@
    <import file="../../contrib-build.xml"/>
  	
    <path id="test.classpath">
-diff -urNad lucene2~/contrib/contrib-build.xml lucene2/contrib/contrib-build.xml
---- lucene2~/contrib/contrib-build.xml	2010-01-23 20:26:27.000000000 +0100
-+++ lucene2/contrib/contrib-build.xml	2010-01-23 20:26:30.000000000 +0100
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/contrib-build.xml lucene2/contrib/contrib-build.xml
+--- lucene2~/contrib/contrib-build.xml	2010-08-06 13:44:30.000000000 +0200
++++ lucene2/contrib/contrib-build.xml	2010-08-06 13:44:32.000000000 +0200
 @@ -24,7 +24,21 @@
    <property name="build.dir" location="../../build/contrib/${ant.project.name}"/>
    <property name="dist.dir" location="../../dist/contrib/${ant.project.name}"/>

Modified: trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch	2010-08-10 22:00:17 UTC (rev 12902)
+++ trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch	2010-08-11 11:08:30 UTC (rev 12903)
@@ -1,44 +1,47 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 49_fix-contrib-db-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+## 50_fix-contrib-db-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.
 
 @DPATCH@
-diff -urNad lucene2~/contrib/db/bdb/build.xml lucene2/contrib/db/bdb/build.xml
---- lucene2~/contrib/db/bdb/build.xml	2009-08-20 08:49:15.000000000 +0200
-+++ lucene2/contrib/db/bdb/build.xml	2009-08-20 08:54:05.000000000 +0200
-@@ -5,10 +5,8 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/db/bdb/build.xml lucene2/contrib/db/bdb/build.xml
+--- lucene2~/contrib/db/bdb/build.xml	2010-06-05 23:08:23.000000000 +0200
++++ lucene2/contrib/db/bdb/build.xml	2010-08-06 10:07:42.000000000 +0200
+@@ -21,13 +21,11 @@
      Lucene Berkeley DB integration
    </description>
  
 -  <property name="db.version" value="4.7.25" />
 -
+   <property name="javac.source" value="1.5" />
+   <property name="javac.target" value="1.5" />
+ 
    <path id="db.jar">
 -    <pathelement location="lib/db-${db.version}.jar" />
 +    <pathelement location="/usr/share/java/libdb4.7-java.jar" />
    </path>
+   
+   <pathconvert property="project.classpath" targetos="unix" refid="db.jar" />
+@@ -51,12 +49,6 @@
+     </available>
+   </target>
  
-   <available classname="com.sleepycat.db.internal.Db" property="db.jar.exists">
-@@ -30,12 +28,6 @@
-     <pathelement location="${build.dir}/classes/java"/>
-   </path>
- 
--  <target name="get-db-jar" unless="db.jar.exists">
+-  <target name="get-db-jar" unless="db.jar.exists" if="build.this.contrib">
 -    <mkdir dir="lib" />
 -    <get src="http://downloads.osafoundation.org/db/db-${db.version}.jar"
 -         dest="lib/db-${db.version}.jar" />
 -  </target>
 -
-   <target name="sanity-load-lib" depends="compile-test">
+   <target name="sanity-load-lib" depends="compile-test" if="build.this.contrib">
      <java classname="org.apache.lucene.store.db.SanityLoadLibrary"
            classpathref="junit.classpath"
-@@ -62,7 +54,6 @@
-     <antcall target="common.test" inheritAll="true" inheritRefs="true" />
+@@ -83,7 +75,6 @@
+     <antcall target="contrib-build.test" inheritAll="true" inheritRefs="true" />
    </target>
  
 -  <target name="check-and-get-db-jar" depends="get-db-jar" />
--  <target name="init" depends="contrib-build.init,check-and-get-db-jar" />
-+  <target name="init" depends="contrib-build.init" />
+-  <target name="init" depends="contrib-build.init,checkJAR,check-and-get-db-jar" />
++  <target name="init" depends="contrib-build.init,checkJAR" />
  
  </project>

Modified: trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch	2010-08-10 22:00:17 UTC (rev 12902)
+++ trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch	2010-08-11 11:08:30 UTC (rev 12903)
@@ -1,27 +1,27 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 54_fix-contrib-db-je-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+## 55_fix-contrib-db-je-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.
 
 @DPATCH@
-diff -urNad lucene2~/contrib/db/bdb-je/build.xml lucene2/contrib/db/bdb-je/build.xml
---- lucene2~/contrib/db/bdb-je/build.xml	2009-08-19 20:22:41.000000000 +0200
-+++ lucene2/contrib/db/bdb-je/build.xml	2009-08-20 08:58:15.000000000 +0200
-@@ -8,7 +8,7 @@
-   <property name="je.version" value="3.3.69" />
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/db/bdb-je/build.xml lucene2/contrib/db/bdb-je/build.xml
+--- lucene2~/contrib/db/bdb-je/build.xml	2010-06-05 23:08:23.000000000 +0200
++++ lucene2/contrib/db/bdb-je/build.xml	2010-08-06 10:15:30.000000000 +0200
+@@ -27,7 +27,7 @@
+   <property name="javac.target" value="1.5" />
  
    <path id="je.jar">
 -    <pathelement location="lib/je-${je.version}/lib/je-${je.version}.jar" />
 +    <pathelement location="/usr/share/java/db-je.jar" />
    </path>
  
-   <available classname="com.sleepycat.je.Database" property="je.jar.exists">
-@@ -30,17 +30,5 @@
-     <pathelement location="${build.dir}/classes/java"/>
-   </path>
+   <pathconvert property="project.classpath" targetos="unix" refid="je.jar" />
+@@ -51,17 +51,5 @@
+     </available>
+   </target>
  
--  <target name="get-je-jar" unless="je.jar.exists">
+-  <target name="get-je-jar" unless="je.jar.exists" if="build.this.contrib">
 -    <mkdir dir="lib" />
 -    <get src="http://download.oracle.com/berkeley-db/je-${je.version}.zip"
 -         dest="lib/je-${je.version}.zip" />
@@ -32,7 +32,7 @@
 -    </unzip>
 -  </target>
 -
--  <target name="check-and-get-je-jar" depends="get-je-jar" />
--  <target name="init" depends="contrib-build.init,check-and-get-je-jar" />
-+  <target name="init" depends="contrib-build.init" />
+-  <target name="check-and-get-je-jar" depends="get-je-jar" if="build.this.contrib" />
+-  <target name="init" depends="contrib-build.init,checkJAR,check-and-get-je-jar" />
++  <target name="init" depends="contrib-build.init,checkJAR" />
  </project>

Modified: trunk/lucene2/debian/patches/80_prevent-downloading-data-files.dpatch
===================================================================
--- trunk/lucene2/debian/patches/80_prevent-downloading-data-files.dpatch	2010-08-10 22:00:17 UTC (rev 12902)
+++ trunk/lucene2/debian/patches/80_prevent-downloading-data-files.dpatch	2010-08-11 11:08:30 UTC (rev 12903)
@@ -2,21 +2,19 @@
 ## 80_prevent-downloading-data-files.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disable running the tests for contrib/benchmark, since it requires
-## DP: downloading test data which may not be possible during automated builds
+## DP: No description.
 
 @DPATCH@
-diff -urNad lucene2~/contrib/benchmark/build.xml lucene2/contrib/benchmark/build.xml
---- lucene2~/contrib/benchmark/build.xml	2008-02-01 10:11:32.000000000 +0100
-+++ lucene2/contrib/benchmark/build.xml	2008-02-01 10:12:47.000000000 +0100
-@@ -167,9 +167,8 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/benchmark/build.xml lucene2/contrib/benchmark/build.xml
+--- lucene2~/contrib/benchmark/build.xml	2010-08-06 10:17:10.000000000 +0200
++++ lucene2/contrib/benchmark/build.xml	2010-08-06 10:31:07.000000000 +0200
+@@ -171,8 +171,8 @@
+     <target name="init" depends="contrib-build.init,compile-demo,compile-memory,compile-highlighter,compile-vector-highlighter,check-files"/>
  
-     <target name="init" depends="common.init,compile-demo,check-files"/>
- 
--    <!-- make sure online collections (reuters) are first downloaded -->
+     <!-- make sure online collections (reuters) are first downloaded -->
 -    <target name="test" depends="init,get-files">
--      <antcall target="common.test" inheritRefs="true" />
-+    <!-- test empty, since automatic builds cannot download test data -->
+-      <antcall target="contrib-build.test" inheritRefs="true" />
++    <!-- test disabled, cannot download reuters and news data in automated build environments -->
 +    <target name="test" depends="init">
      </target>
      

Modified: trunk/lucene2/debian/patches/82_disable-svnversion-calls.dpatch
===================================================================
--- trunk/lucene2/debian/patches/82_disable-svnversion-calls.dpatch	2010-08-10 22:00:17 UTC (rev 12902)
+++ trunk/lucene2/debian/patches/82_disable-svnversion-calls.dpatch	2010-08-11 11:08:30 UTC (rev 12903)
@@ -2,14 +2,12 @@
 ## 82_disable-svnversion-calls.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove the calls to svnversion. svnversion is used to include the
-## DP: svn revision of the lucene source in the Manifest files, but calling
-## DP: svnversion may require network access which isn't available in buildds
+## DP: No description.
 
 @DPATCH@
-diff -urNad lucene2~/common-build.xml lucene2/common-build.xml
---- lucene2~/common-build.xml	2010-01-22 09:36:40.000000000 +0100
-+++ lucene2/common-build.xml	2010-01-22 09:37:27.000000000 +0100
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/common-build.xml lucene2/common-build.xml
+--- lucene2~/common-build.xml	2010-08-06 11:29:27.000000000 +0200
++++ lucene2/common-build.xml	2010-08-06 11:30:19.000000000 +0200
 @@ -99,15 +99,6 @@
  
    <property name="manifest.file" location="${common.dir}/build/MANIFEST.MF"/>
@@ -23,10 +21,10 @@
 -  <property name="svnversion.exe" value="svnversion" />
 -  <property name="svn.exe" value="svn" />
 -  
-   <condition property="build-1-5-contrib">
-      <equals arg1="1.5" arg2="${ant.java.version}" />
-   </condition>
-@@ -307,7 +298,7 @@
+   <available property="build-1-5-contrib" classname="java.lang.StringBuilder" />
+   
+   <property name="clover.db.dir" location="${common.dir}/build/test/clover/db"/>
+@@ -305,7 +296,7 @@
  		<attribute name="Implementation-Title" value="org.apache.lucene"/>
  		<!-- impl version can be any string -->
  		<attribute name="Implementation-Version"
@@ -35,7 +33,7 @@
  		<attribute name="Implementation-Vendor"
  		           value="The Apache Software Foundation"/>
  		<attribute name="X-Compile-Source-JDK" 
-@@ -347,11 +338,6 @@
+@@ -345,12 +336,6 @@
      <element name="manifest-attributes" optional="yes"/>
    	<element name="metainf-includes" optional="yes"/>
      <sequential>
@@ -44,6 +42,7 @@
 -            outputproperty="svnversion" failifexecutionfails="false">
 -        <arg line="."/>
 -      </exec>
-       
+-      
        <build-manifest/>
      	
+       <jar

Modified: trunk/lucene2/debian/rules
===================================================================
--- trunk/lucene2/debian/rules	2010-08-10 22:00:17 UTC (rev 12902)
+++ trunk/lucene2/debian/rules	2010-08-11 11:08:30 UTC (rev 12903)
@@ -18,7 +18,7 @@
 DEB_ANT_CLEAN_TARGET := clean clean-javacc
 
 # Needed for running javacc and the unit tests
-DEB_JARS = ant-nodeps ant-junit junit
+DEB_JARS = ant-nodeps ant-contrib ant-junit junit
 
 # Upstream Lucene name
 UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | grep -o "^[^+]*" | sed -e "s/~/-/" )

Modified: trunk/lucene2/debian/watch
===================================================================
--- trunk/lucene2/debian/watch	2010-08-10 22:00:17 UTC (rev 12902)
+++ trunk/lucene2/debian/watch	2010-08-11 11:08:30 UTC (rev 12903)
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\+ds\d// \
-http://www.apache.org/dist/lucene/java/lucene-(.*)-src\.tar\.gz
+http://www.apache.org/dist/lucene/java/lucene-(2\.9.*)-src\.tar\.gz




More information about the pkg-java-commits mailing list