[pkg-java] r3952 - trunk/lucene2/debian/patches/old
janpascal-guest at alioth.debian.org
janpascal-guest at alioth.debian.org
Wed Aug 1 20:30:44 UTC 2007
Author: janpascal-guest
Date: 2007-08-01 20:30:44 +0000 (Wed, 01 Aug 2007)
New Revision: 3952
Removed:
trunk/lucene2/debian/patches/old/01_remove_all_jarfiles.dpatch
trunk/lucene2/debian/patches/old/02_full.dpatch
trunk/lucene2/debian/patches/old/03_fix-benchmark-jar-locations.dpatch
trunk/lucene2/debian/patches/old/04_fix-junit-error-in-contrib-highlight.dpatch
Log:
Removed old dpatch files
Deleted: trunk/lucene2/debian/patches/old/01_remove_all_jarfiles.dpatch
===================================================================
--- trunk/lucene2/debian/patches/old/01_remove_all_jarfiles.dpatch 2007-08-01 20:30:38 UTC (rev 3951)
+++ trunk/lucene2/debian/patches/old/01_remove_all_jarfiles.dpatch 2007-08-01 20:30:44 UTC (rev 3952)
@@ -1,33 +0,0 @@
-#! /bin/sh
-## 01_remove_all_jarfiles.dpatch -- Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## DP: We want to be use we do not build using jar files contained
-## DP: in the Lucene distribution tarball, so we start by removing
-## DP: all jar files.
-
-OPERATION="$1"
-DIRECTORY="$2"
-
-if [ -z "$OPERATION" ]; then
- echo "Illegal arguments"
- exit 1
-fi
-
-if [ -z "$DIRECTORY" ]; then
- DIRECTORY="."
-fi
-
-case "$OPERATION" in
- -patch)
- echo "Removing all jar files under $DIRECTORY"
- find $DIRECTORY -name \*.jar -exec rm {} \;
- ;;
- -unpatch)
- echo "Unable to magic back jar files..."
- ;;
- *)
- echo "Illegal command line $1 $2"
- exit 1
- ;;
-esac
-
Deleted: trunk/lucene2/debian/patches/old/02_full.dpatch
===================================================================
--- trunk/lucene2/debian/patches/old/02_full.dpatch 2007-08-01 20:30:38 UTC (rev 3951)
+++ trunk/lucene2/debian/patches/old/02_full.dpatch 2007-08-01 20:30:44 UTC (rev 3952)
@@ -1,124 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_full.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## DP: This patch file contains various patches to get Lucene to work
-## DP: nicely with Debian. Needs to be split up in separate patches.
-
- at 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
Deleted: trunk/lucene2/debian/patches/old/03_fix-benchmark-jar-locations.dpatch
===================================================================
--- trunk/lucene2/debian/patches/old/03_fix-benchmark-jar-locations.dpatch 2007-08-01 20:30:38 UTC (rev 3951)
+++ trunk/lucene2/debian/patches/old/03_fix-benchmark-jar-locations.dpatch 2007-08-01 20:30:44 UTC (rev 3952)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_fix-benchmark-jar-locations.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## DP: Fix build.xml of contrib/benchmark so that it uses the jar files
-## DP: in /usr/share/java instead of those in the Lucene source tarball
-
- at DPATCH@
-
-diff -u -r lucene-2.1.0/contrib/benchmark/build.xml lucene-2.1.0-new/contrib/benchmark/build.xml
---- lucene-2.1.0/contrib/benchmark/build.xml 2007-02-14 17:46:14.000000000 +0100
-+++ lucene-2.1.0-new/contrib/benchmark/build.xml 2007-04-15 17:51:11.000000000 +0200
-@@ -82,17 +82,17 @@
- <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="collections.jar" value="commons-collections3.jar"/>
- <property name="logging.jar" value="commons-logging-1.0.4.jar"/>
- <property name="bean-utils.jar" value="commons-beanutils-1.7.0.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"/>
Deleted: trunk/lucene2/debian/patches/old/04_fix-junit-error-in-contrib-highlight.dpatch
===================================================================
--- trunk/lucene2/debian/patches/old/04_fix-junit-error-in-contrib-highlight.dpatch 2007-08-01 20:30:38 UTC (rev 3951)
+++ trunk/lucene2/debian/patches/old/04_fix-junit-error-in-contrib-highlight.dpatch 2007-08-01 20:30:44 UTC (rev 3952)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_fix-junit-error-in-contrib-highlight.dpatch by Mark Harwood <markharw00d at yahoo.co.uk>
-##
-## DP: Fixes a junit error in contrib/highlighter, see
-## DP: http://svn.apache.org/viewvc?view=rev&revision=529417
-
- at DPATCH@
-
---- trunk/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java 2006/11/09 16:21:50 472959
-+++ trunk/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java 2007/04/16 22:04:07 529417
-@@ -132,7 +132,14 @@
- }
- public void testGetRangeFragments() throws Exception
- {
-- doSearching(FIELD_NAME + ":[kannedy TO kznnedy]"); //bug?needs lower case
-+ String queryString=FIELD_NAME + ":[kannedy TO kznnedy]";
-+
-+ //Need to explicitly set the QueryParser property to use RangeQuery rather than RangeFilters
-+ QueryParser parser=new QueryParser(FIELD_NAME, new StandardAnalyzer());
-+ parser.setUseOldRangeQuery(true);
-+ query = parser.parse(queryString);
-+ doSearching(query);
-+
- doStandardHighlights();
- assertTrue("Failed to find correct number of highlights " + numHighlights + " found", numHighlights == 5);
- }
More information about the pkg-java-commits
mailing list