This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository lucene2.
commit 4834255e8e9ebe12340b070816a7cd351cf578d5 Author: Jan-Pascal van Best <[email protected]> Date: Wed Aug 1 20:29:33 2007 +0000 Fixes patches again --- debian/patches/00list | 2 +- debian/patches/01_full | 124 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 1 deletion(-) diff --git a/debian/patches/00list b/debian/patches/00list index ac550ef..d575c0c 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1 +1 @@ -01full +01_full diff --git a/debian/patches/01_full b/debian/patches/01_full new file mode 100755 index 0000000..341793d --- /dev/null +++ b/debian/patches/01_full @@ -0,0 +1,124 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_full.dpatch by <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ + +--- lucene2-2.1.0.orig/contrib/db/bdb/build.xml ++++ lucene2-2.1.0/contrib/db/bdb/build.xml +@@ -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"> +@@ -19,6 +19,7 @@ + + <property name="build.dir" location="../../../build/contrib/db/bdb" /> + <property name="dist.dir" location="../../../dist/contrib/db/bdb" /> ++ <property name="java.library.path" location="/usr/lib/libdb_java.so" /> + + <import file="../../contrib-build.xml" /> + +--- lucene2-2.1.0.orig/contrib/lucli/build.xml ++++ lucene2-2.1.0/contrib/lucli/build.xml +@@ -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" +--- lucene2-2.1.0.orig/contrib/regex/build.xml ++++ lucene2-2.1.0/contrib/regex/build.xml +@@ -7,7 +7,8 @@ + </description> + + <path id="additional.dependencies"> +- <fileset dir="lib" includes="*-oro-*.jar,*-regexp-*.jar"/> ++ <fileset dir="/usr/share/java" includes="regexp-*.jar"/> ++ <!--<fileset dir="/usr/share/java" includes="*-oro-*.jar,*-regexp-*.jar"/> --> + </path> + + <pathconvert property="project.classpath" +--- lucene2-2.1.0.orig/contrib/contrib-build.xml ++++ lucene2-2.1.0/contrib/contrib-build.xml +@@ -19,6 +19,7 @@ + <path id="test.classpath"> + <path refid="classpath"/> + <pathelement location="${junit.jar}"/> ++ <pathelement location="../../build/classes/test"/> + <pathelement location="${build.dir}/classes/java"/> + </path> + +--- lucene2-2.1.0.orig/build.xml ++++ lucene2-2.1.0/build.xml +@@ -386,7 +386,7 @@ + <packageset dir="src/demo"/> + + <packageset dir="contrib/analyzers/src/java"/> +- <packageset dir="contrib/ant/src/java"/> ++ <!-- debian-ignore <packageset dir="contrib/ant/src/java"/> --> + <packageset dir="contrib/highlighter/src/java"/> + <packageset dir="contrib/lucli/src/java"/> + <packageset dir="contrib/memory/src/java"/> +@@ -400,9 +400,9 @@ + <packageset dir="contrib/wordnet/src/java"/> + <packageset dir="contrib/benchmark/src/java"/> + +- <packageset refid="gdata-server-core" /> +- <packageset refid="gdata-server-gom" /> +- <packageset refid="gdata-server-hivemind" /> ++ <!-- debian-ignore <packageset refid="gdata-server-core" /> --> ++ <!-- debian-ignore <packageset refid="gdata-server-gom" /> --> ++ <!-- debian-ignore <packageset refid="gdata-server-hivemind" /> --> + + <group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*"/> + +@@ -425,6 +425,9 @@ + <group title="contrib: Swing" packages="org.apache.lucene.swing*"/> + <group title="contrib: WordNet" packages="org.apache.lucene.wordnet*"/> + ++ <link href="http://jline.sourceforge.net/apidocs/"/> ++ <link href="http://jakarta.apache.org/regexp/apidocs/"/> ++ <link href="http://jakarta.apache.org/commons/digester/commons-digester-1.7/docs/api/"/> + + </javadoc> + </sequential> +--- lucene2-2.1.0.orig/common-build.xml ++++ lucene2-2.1.0/common-build.xml +@@ -22,7 +22,7 @@ + + <property name="name" value="${ant.project.name}"/> + <property name="Name" value="Lucene"/> +- <property name="version" value="2.1.1-dev"/> ++ <property name="version" value="2.1.0"/> + <property name="year" value="2000-${current.year}"/> + <property name="final.name" value="lucene-${name}-${version}"/> + +@@ -38,7 +38,8 @@ + <property name="build.dir" location="build"/> + <property name="dist.dir" location="dist"/> + +- <property name="javacc.home" location="${common.dir}"/> ++ <property name="javacc.home" location="/usr/share/java"/> ++ <property name="javacc.jar" location="/usr/share/java/javacc.jar"/> + + <property name="junit.output.dir" location="${build.dir}/test"/> + <property name="junit.reports" location="${build.dir}/test/reports"/> +@@ -64,7 +65,7 @@ + <available + property="javacc.present" + classname="org.javacc.parser.Main" +- classpath="${javacc.home}/bin/lib/javacc.jar" ++ classpath="/usr/share/java/javacc.jar" + /> + + <available -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
