[pkg-java] r12922 - in trunk/lucene3/debian: . patches
Jan-Pascal van Best
janpascal-guest at alioth.debian.org
Thu Aug 19 07:58:05 UTC 2010
Author: janpascal-guest
Date: 2010-08-19 07:58:03 +0000 (Thu, 19 Aug 2010)
New Revision: 12922
Added:
trunk/lucene3/debian/patches/20_add-classpath-to-manifest-in-jars.dpatch
Modified:
trunk/lucene3/debian/changelog
trunk/lucene3/debian/patches/00list
Log:
Added patch to add classpath to manifest in contrib jars
Modified: trunk/lucene3/debian/changelog
===================================================================
--- trunk/lucene3/debian/changelog 2010-08-18 13:40:57 UTC (rev 12921)
+++ trunk/lucene3/debian/changelog 2010-08-19 07:58:03 UTC (rev 12922)
@@ -3,6 +3,8 @@
* New upstream release. Lucene3 is not backwards compatible with lucene2;
source using lucene will need to be recompiled and possibly patched.
Lucene3 uses Java5 features (such as generics) and removes deprecated APIs.
+ * Add Class-Path entries to the contrib jar files' MANIFEST.MF containing
+ the lucene-core jar files and other dependencies.
* Bump standards version to 3.9.1 (no changes needed)
-- Jan-Pascal van Best <janpascal at vanbest.org> Thu, 12 Aug 2010 11:51:54 +0200
Modified: trunk/lucene3/debian/patches/00list
===================================================================
--- trunk/lucene3/debian/patches/00list 2010-08-18 13:40:57 UTC (rev 12921)
+++ trunk/lucene3/debian/patches/00list 2010-08-19 07:58:03 UTC (rev 12922)
@@ -1,8 +1,8 @@
01_remove_all_jarfiles.dpatch
05_add-osgi-metadata-in-manifests.dpatch
-09_fix-clean-javacc-target.dpatch
10_fix-javacc-locations.dpatch
11_fix-javacc-generated-files.dpatch
+20_add-classpath-to-manifest-in-jars.dpatch
30_fix-contrib-ant-libs.dpatch
31_fix-contrib-ant-test-wrong-encoding.dpatch
40_fix-contrib-benchmark-libs.dpatch
Added: trunk/lucene3/debian/patches/20_add-classpath-to-manifest-in-jars.dpatch
===================================================================
--- trunk/lucene3/debian/patches/20_add-classpath-to-manifest-in-jars.dpatch (rev 0)
+++ trunk/lucene3/debian/patches/20_add-classpath-to-manifest-in-jars.dpatch 2010-08-19 07:58:03 UTC (rev 12922)
@@ -0,0 +1,108 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_add-classpath-to-manifest-in-jars.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene3~/contrib/collation/build.xml lucene3/contrib/collation/build.xml
+--- lucene3~/contrib/collation/build.xml 2010-08-13 15:26:10.000000000 +0200
++++ lucene3/contrib/collation/build.xml 2010-08-13 15:28:15.000000000 +0200
+@@ -37,6 +37,10 @@
+
+ <import file="../contrib-build.xml"/>
+
++ <property name="manifest.classpath"
++ value="/usr/share/java/lucene-core-${version}.jar /usr/share/java/lucene-misc-${version}.jar"
++ />
++
+ <target name="compile-misc">
+ <subant target="compile">
+ <fileset dir="${common.dir}/contrib/misc" includes="build.xml"/>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene3~/contrib/contrib-build.xml lucene3/contrib/contrib-build.xml
+--- lucene3~/contrib/contrib-build.xml 2010-08-13 15:26:12.000000000 +0200
++++ lucene3/contrib/contrib-build.xml 2010-08-13 15:26:12.000000000 +0200
+@@ -24,6 +24,8 @@
+ <property name="build.dir" location="../../build/contrib/${ant.project.name}"/>
+ <property name="dist.dir" location="../../dist/contrib/${ant.project.name}"/>
+ <property name="maven.dist.dir" location="../../dist/maven"/>
++
++ <property name="project.classpath" value=""/>
+
+ <!-- these can be overridden in the separate contrib
+ build.xml files -->
+@@ -52,6 +54,13 @@
+ <pathelement path="${project.classpath}"/>
+ </path>
+
++ <path id="external.classpath">
++ <pathelement path="/usr/share/java/lucene-core-$(version}.jar"/>
++ <pathelement path="${project.classpath}"/>
++ </path>
++
++ <pathconvert property="manifest.classpath" pathsep=" " refid="external.classpath" />
++
+ <path id="test.classpath">
+ <path refid="classpath"/>
+ <pathelement location="../../build/classes/test/"/>
+@@ -74,6 +83,13 @@
+ <ant dir="${common.dir}" target="compile-test" inheritAll="false"/>
+ </target>
+
++ <target name="jar" depends="compile" description="Create JAR">
++ <jarify>
++ <manifest-attributes>
++ <attribute name="Class-Path" value="/usr/share/java/lucene-core-${version}.jar ${project.classpath}" />
++ </manifest-attributes>
++ </jarify>
++ </target>
+
+ <target name="init" depends="common.init,build-lucene,build-lucene-tests"/>
+ <target name="compile-test" depends="init" if="contrib.has.tests">
+@@ -124,5 +140,7 @@
+ <li><a href="contrib-${name}/index.html">${name}</a></li>
+ ]]></echo>
+ </target>
++
++ <target name="default" depends="jar"/>
+
+ </project>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene3~/contrib/db/bdb/build.xml lucene3/contrib/db/bdb/build.xml
+--- lucene3~/contrib/db/bdb/build.xml 2010-08-13 15:26:10.000000000 +0200
++++ lucene3/contrib/db/bdb/build.xml 2010-08-13 15:26:12.000000000 +0200
+@@ -15,7 +15,7 @@
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+-<project name="bdb" default="default">
++<project name="bdb" default="jar">
+
+ <description>
+ Lucene Berkeley DB integration
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene3~/contrib/lucli/build.xml lucene3/contrib/lucli/build.xml
+--- lucene3~/contrib/lucli/build.xml 2010-08-13 15:26:10.000000000 +0200
++++ lucene3/contrib/lucli/build.xml 2010-08-13 15:31:33.000000000 +0200
+@@ -42,7 +42,9 @@
+ <jarify>
+ <manifest-attributes>
+ <attribute name="Main-Class" value="lucli.Lucli" />
+- <attribute name="Class-Path" value="lib/jline.jar lib/lucene.jar" />
++ <attribute name="Class-Path"
++ value="/usr/share/java/lucene-core-${version}.jar /usr/share/java/jline.jar"
++ />
+ </manifest-attributes>
+ </jarify>
+ </target>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene3~/contrib/snowball/build.xml lucene3/contrib/snowball/build.xml
+--- lucene3~/contrib/snowball/build.xml 2010-08-13 15:26:10.000000000 +0200
++++ lucene3/contrib/snowball/build.xml 2010-08-13 15:26:12.000000000 +0200
+@@ -32,6 +32,9 @@
+
+ <target name="jar" depends="compile" description="Create JAR">
+ <jarify>
++ <manifest-attributes>
++ <attribute name="Class-Path" value="/usr/share/java/lucene-core-${version}.jar" />
++ </manifest-attributes>
+ <metainf-includes>
+ <metainf dir=".">
+ <include name="SNOWBALL-LICENSE.txt"/>
Property changes on: trunk/lucene3/debian/patches/20_add-classpath-to-manifest-in-jars.dpatch
___________________________________________________________________
Added: svn:executable
+ *
More information about the pkg-java-commits
mailing list