[pkg-java] r3953 - trunk/lucene2/debian/patches
janpascal-guest at alioth.debian.org
janpascal-guest at alioth.debian.org
Wed Aug 1 20:30:49 UTC 2007
Author: janpascal-guest
Date: 2007-08-01 20:30:49 +0000 (Wed, 01 Aug 2007)
New Revision: 3953
Added:
trunk/lucene2/debian/patches/10_fix-javacc-locations.dpatch
trunk/lucene2/debian/patches/20_remove-gdata-server.dpatch
trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.dpatch
trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch
trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch
trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch
trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.dpatch
trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.dpatch
Modified:
trunk/lucene2/debian/patches/00list
Log:
Add patched to fix external libraries, remove gdata-server and bdb-je
Modified: trunk/lucene2/debian/patches/00list
===================================================================
--- trunk/lucene2/debian/patches/00list 2007-08-01 20:30:44 UTC (rev 3952)
+++ trunk/lucene2/debian/patches/00list 2007-08-01 20:30:49 UTC (rev 3953)
@@ -1,4 +1,9 @@
01_remove_all_jarfiles.dpatch
-02_full.dpatch
-03_fix-benchmark-jar-locations.dpatch
-04_fix-junit-error-in-contrib-highlight.dpatch
+10_fix-javacc-locations.dpatch
+20_remove-gdata-server.dpatch
+30_fix-contrib-ant-libs.dpatch
+40_fix-contrib-benchmark-libs.dpatch
+50_fix-contrib-db-libs.dpatch
+55_disable-db-jre-compilation.dpatch
+60_fix-contrib-lucli-libs.dpatch
+70_fix-contrib-regex-libs.dpatch
Added: trunk/lucene2/debian/patches/10_fix-javacc-locations.dpatch
===================================================================
--- trunk/lucene2/debian/patches/10_fix-javacc-locations.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/10_fix-javacc-locations.dpatch 2007-08-01 20:30:49 UTC (rev 3953)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix-javacc-locations.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix lucene's build configuration to find javacc
+
+ at DPATCH@
+diff -urNad trunk~/common-build.xml trunk/common-build.xml
+--- trunk~/common-build.xml 2007-06-05 11:30:44.000000000 +0200
++++ trunk/common-build.xml 2007-06-05 11:31:14.000000000 +0200
+@@ -39,6 +39,7 @@
+ <property name="dist.dir" location="dist"/>
+
+ <property name="javacc.home" location="${common.dir}"/>
++ <property name="javacc.jar" location="$(javacc.home}/bin/lib/javacc.jar"/>
+
+ <property name="junit.output.dir" location="${build.dir}/test"/>
+ <property name="junit.reports" location="${build.dir}/test/reports"/>
+@@ -67,7 +68,7 @@
+ <available
+ property="javacc.present"
+ classname="org.javacc.parser.Main"
+- classpath="${javacc.home}/bin/lib/javacc.jar"
++ classpath="${javacc.jar}"
+ />
+
+ <available
Property changes on: trunk/lucene2/debian/patches/10_fix-javacc-locations.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/lucene2/debian/patches/20_remove-gdata-server.dpatch
===================================================================
--- trunk/lucene2/debian/patches/20_remove-gdata-server.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/20_remove-gdata-server.dpatch 2007-08-01 20:30:49 UTC (rev 3953)
@@ -0,0 +1,78 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_remove-gdata-server.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 trunk~/build.xml trunk/build.xml
+--- trunk~/build.xml 2007-06-05 13:18:25.000000000 +0200
++++ trunk/build.xml 2007-06-05 13:19:51.000000000 +0200
+@@ -28,6 +28,7 @@
+ <!-- NOTE: gdata jars only used with jdk 5 but include them even for lower jdk -->
+ <fileset dir="contrib">
+ <include name="**/*.jar"/>
++ <exclude name="gdata-server/**/*.jar"/>
+ </fileset>
+ </path>
+
+@@ -51,10 +52,11 @@
+
+ <patternset id="src.dist.patterns"
+ includes="src/,build.xml,*build*.xml,docs/,*.txt,contrib/,"
+- excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/"
++ excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/,contrib/gdata-server/"
+ />
+ <patternset id="binary.build.dist.patterns"
+ includes="${final.name}.jar,${demo.war.name}.war,${demo.name}.jar,docs/,contrib/*/*.jar"
++ excludes="contrib/gdata-server/*.jar"
+ />
+ <patternset id="binary.root.dist.patterns"
+ includes="src/demo/,src/jsp/,docs/,*.txt"
+@@ -370,6 +372,7 @@
+ <subant target="@{target}" failonerror="@{failonerror}">
+ <fileset dir="."
+ includes="contrib/*/build.xml"
++ excludes="contrib/gdata-server/build.xml"
+ />
+ </subant>
+ </sequential>
+@@ -399,7 +402,7 @@
+ <attribute name="access"/>
+ <attribute name="destdir"/>
+ <sequential>
+-
++ <!-- debian-ignore
+ <dirset dir="contrib/gdata-server/src/core/src/java" id="gdata-server-core">
+ <include name="**" if="build-1-5-contrib" />
+ </dirset>
+@@ -409,6 +412,7 @@
+ <dirset dir="contrib/gdata-server/src/hivemind/src/java" id="gdata-server-hivemind">
+ <include name="**" if="build-1-5-contrib" />
+ </dirset>
++ -->
+
+ <javadoc
+ overview="src/java/overview.html"
+@@ -459,9 +463,11 @@
+ <packageset dir="contrib/wordnet/src/java"/>
+ <packageset dir="contrib/xml-query-parser/src/java"/>
+ <!-- end alpha sort -->
++ <!-- debian-ignore
+ <packageset refid="gdata-server-core" />
+ <packageset refid="gdata-server-gom" />
+ <packageset refid="gdata-server-hivemind" />
++ -->
+
+ <!-- If the main javadoc Group listing includes an "Other -->
+ <!-- Packages" group after the ones listed here, then those -->
+@@ -476,7 +482,9 @@
+ <group title="contrib: Benchmark" packages="org.apache.lucene.benchmark*"/>
+ <group title="contrib: DB" packages="org.apache.lucene.store.db*:org.apache.lucene.store.je*:com.sleepycat*"/>
+ <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*"/>
++ <!-- debian-ignore
+ <group title="contrib: GData Server (Java1.5)" packages="org.apache.lucene.gdata.*"/>
++ -->
+ <group title="contrib: Lucli" packages="lucli*"/>
+ <group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
+ <group title="contrib: Miscellaneous " packages="org.apache.lucene.misc*:org.apache.lucene.queryParser.analyzing*:org.apache.lucene.queryParser.precedence*"/>
Property changes on: trunk/lucene2/debian/patches/20_remove-gdata-server.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.dpatch 2007-08-01 20:30:49 UTC (rev 3953)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_fix-contrib-ant-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.
+
+ at DPATCH@
+diff -urNad trunk~/contrib/ant/build.xml trunk/contrib/ant/build.xml
+--- trunk~/contrib/ant/build.xml 2007-06-04 06:02:05.000000000 +0200
++++ trunk/contrib/ant/build.xml 2007-06-05 13:30:58.000000000 +0200
+@@ -7,7 +7,7 @@
+
+ <path id="additional.dependencies">
+ <!-- TODO: make ${tidy.jar} property -->
+- <pathelement location="lib/Tidy.jar"/>
++ <pathelement location="/usr/share/java/jtidy.jar"/>
+ </path>
+
+ <pathconvert property="project.classpath"
Property changes on: trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch 2007-08-01 20:30:49 UTC (rev 3953)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_fix-contrib-benchmark-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.
+
+ at DPATCH@
+diff -urNad trunk~/contrib/benchmark/build.xml trunk/contrib/benchmark/build.xml
+--- trunk~/contrib/benchmark/build.xml 2007-06-04 06:02:17.000000000 +0200
++++ trunk/contrib/benchmark/build.xml 2007-06-05 13:37:06.000000000 +0200
+@@ -81,18 +81,18 @@
+ <antcall target="expand-reuters"/>
+ <antcall target="extract-reuters"/>
+ </target>
+- <property name="digester.jar" value="commons-digester-1.7.jar"/>
+- <property name="collections.jar" value="commons-collections-3.1.jar"/>
+- <property name="logging.jar" value="commons-logging-1.0.4.jar"/>
+- <property name="bean-utils.jar" value="commons-beanutils-1.7.0.jar"/>
++ <property name="digester.jar" value="commons-digester.jar"/>
++ <property name="collections.jar" value="commons-collections-3.jar"/>
++ <property name="logging.jar" value="commons-logging.jar"/>
++ <property name="bean-utils.jar" value="commons-beanutils.jar"/>
+
+ <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="/usr/share/java/${digester.jar}"/>
++ <pathelement path="/usr/share/java/${collections.jar}"/>
++ <pathelement path="/usr/share/java/${logging.jar}"/>
++ <pathelement path="/usr/share/java/${bean-utils.jar}"/>
+ </path>
+ <path id="run.classpath">
+ <path refid="classpath"/>
Property changes on: trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch 2007-08-01 20:30:49 UTC (rev 3953)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 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.
+
+ at DPATCH@
+diff -urNad trunk~/contrib/db/bdb/build.xml trunk/contrib/db/bdb/build.xml
+--- trunk~/contrib/db/bdb/build.xml 2007-06-04 06:02:15.000000000 +0200
++++ trunk/contrib/db/bdb/build.xml 2007-06-05 13:42:30.000000000 +0200
+@@ -8,7 +8,7 @@
+ <property name="db.version" value="4.3.29" />
+
+ <path id="db.jar">
+- <pathelement location="lib/db-${db.version}.jar" />
++ <pathelement location="/usr/share/java/libdb4.3-java.jar" />
+ </path>
+
+ <available classname="com.sleepycat.db.internal.Db" property="db.jar.exists">
+@@ -22,12 +22,6 @@
+
+ <import file="../../contrib-build.xml" />
+
+- <target name="get-db-jar" unless="db.jar.exists">
+- <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">
+ <java classname="org.apache.lucene.store.db.SanityLoadLibrary"
+ classpathref="junit.classpath"
+@@ -54,7 +48,6 @@
+ <antcall target="common.test" inheritAll="true" inheritRefs="true" />
+ </target>
+
+- <target name="check-and-get-db-jar" depends="get-db-jar" />
+- <target name="init" depends="common.init,check-and-get-db-jar" />
++ <target name="init" depends="common.init" />
+
+ </project>
+
Property changes on: trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch
===================================================================
--- trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch 2007-08-01 20:30:49 UTC (rev 3953)
@@ -0,0 +1,74 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55_disable-db-jre-compilation.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 trunk~/build.xml trunk/build.xml
+--- trunk~/build.xml 2007-06-05 14:05:22.000000000 +0200
++++ trunk/build.xml 2007-06-05 14:05:23.000000000 +0200
+@@ -29,6 +29,7 @@
+ <fileset dir="contrib">
+ <include name="**/*.jar"/>
+ <exclude name="gdata-server/**/*.jar"/>
++ <exclude name="db/dbd-je/**/*.jar"/>
+ </fileset>
+ </path>
+
+@@ -52,11 +53,11 @@
+
+ <patternset id="src.dist.patterns"
+ includes="src/,build.xml,*build*.xml,docs/,*.txt,contrib/,"
+- excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/,contrib/gdata-server/"
++ excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/,contrib/gdata-server/,contrib/db/bdb-je/"
+ />
+ <patternset id="binary.build.dist.patterns"
+ includes="${final.name}.jar,${demo.war.name}.war,${demo.name}.jar,docs/,contrib/*/*.jar"
+- excludes="contrib/gdata-server/*.jar"
++ excludes="contrib/gdata-server/*.jar,contrib/db/bdb-je/*.jar"
+ />
+ <patternset id="binary.root.dist.patterns"
+ includes="src/demo/,src/jsp/,docs/,*.txt"
+@@ -372,7 +373,7 @@
+ <subant target="@{target}" failonerror="@{failonerror}">
+ <fileset dir="."
+ includes="contrib/*/build.xml"
+- excludes="contrib/gdata-server/build.xml"
++ excludes="contrib/gdata-server/build.xml,contrib/db/bdb-je/build.xml"
+ />
+ </subant>
+ </sequential>
+diff -urNad trunk~/contrib/db/build.xml trunk/contrib/db/build.xml
+--- trunk~/contrib/db/build.xml 2007-06-04 06:02:15.000000000 +0200
++++ trunk/contrib/db/build.xml 2007-06-05 14:05:52.000000000 +0200
+@@ -4,27 +4,21 @@
+ <description>
+ Lucene DB integration
+ - bdb: using the Java interface of C Berkeley DB
+- - bdb-je: using Berkeley DB Java Edition
++ - bdb-je: using Berkeley DB Java Edition (removed for Debian)
+ </description>
+
+ <target name="bdb">
+ <ant dir="bdb" />
+ </target>
+
+- <target name="bdb-je">
+- <ant dir="bdb-je" />
+- </target>
+-
+- <target name="default" depends="bdb,bdb-je" />
++ <target name="default" depends="bdb" />
+
+ <target name="clean">
+ <ant dir="bdb" target="clean" />
+- <ant dir="bdb-je" target="clean" />
+ </target>
+
+ <target name="test">
+ <ant dir="bdb" target="test" />
+- <ant dir="bdb-je" target="test" />
+ </target>
+
+ </project>
Property changes on: trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.dpatch 2007-08-01 20:30:49 UTC (rev 3953)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_fix-contrib-lucli-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.
+
+ at DPATCH@
+diff -urNad trunk~/contrib/lucli/build.xml trunk/contrib/lucli/build.xml
+--- trunk~/contrib/lucli/build.xml 2007-06-04 06:02:20.000000000 +0200
++++ trunk/contrib/lucli/build.xml 2007-06-05 13:52:51.000000000 +0200
+@@ -8,7 +8,7 @@
+
+
+ <path id="additional.dependencies">
+- <pathelement location="lib/jline.jar"/>
++ <pathelement location="/usr/share/java/jline.jar"/>
+ </path>
+
+ <pathconvert property="project.classpath"
Property changes on: trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.dpatch 2007-08-01 20:30:49 UTC (rev 3953)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_fix-contrib-regex-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.
+
+ at DPATCH@
+diff -urNad trunk~/contrib/regex/build.xml trunk/contrib/regex/build.xml
+--- trunk~/contrib/regex/build.xml 2007-06-04 06:02:22.000000000 +0200
++++ trunk/contrib/regex/build.xml 2007-06-05 13:58:54.000000000 +0200
+@@ -7,7 +7,7 @@
+ </description>
+
+ <path id="additional.dependencies">
+- <fileset dir="lib" includes="*-oro-*.jar,*-regexp-*.jar"/>
++ <fileset dir="/usr/share/java" includes="regexp.jar"/>
+ </path>
+
+ <pathconvert property="project.classpath"
Property changes on: trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the pkg-java-commits
mailing list