[lucene2] 66/104: Preparing for the Lucene 2.9 release
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Mar 23 16:27:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository lucene2.
commit d3b6a011f5e177d158fa587d46e15c01aa9562d9
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date: Thu Aug 20 21:10:15 2009 +0000
Preparing for the Lucene 2.9 release
---
debian/changelog | 7 ++
debian/control | 10 ++-
debian/patches/00list | 3 +-
.../11_run-javacc-for-contrib-queryparser.dpatch | 96 ++++++++++++++++++++++
.../patches/40_fix-contrib-benchmark-libs.dpatch | 56 ++++---------
.../patches/45_fix-contrib-collation-libs.dpatch | 19 +++++
debian/patches/50_fix-contrib-db-libs.dpatch | 23 +++---
debian/patches/55_fix-contrib-db-je-libs.dpatch | 28 +++----
debian/patches/90_fix-invalid-tests.dpatch | 36 --------
debian/rules | 1 +
10 files changed, 172 insertions(+), 107 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3ae460d..d8a8e18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lucene2 (2.9-dev+ds1-1) unstable; urgency=low
+
+ * New upstream version
+ * Updated Debian patches for Lucene 2.9
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Thu, 20 Aug 2009 09:17:55 +0200
+
lucene2 (2.4.1+ds1-1) unstable; urgency=low
* New upstream version (2.4.1).
diff --git a/debian/control b/debian/control
index 3740f11..1787591 100644
--- a/debian/control
+++ b/debian/control
@@ -15,11 +15,12 @@ Build-Depends-Indep: libjtidy-java (>= 7),
libjline-java (>= 0.9.5),
libcommons-digester-java (>= 1.7),
libregexp-java (>= 1.4),
- libdb4.6-java,
+ libdb4.7-java,
libdb-je-java (>= 3.2.68),
libcommons-collections3-java (>= 3.1),
libcommons-logging-java (>= 1.0.4),
- libcommons-beanutils-java (>= 1.7.0)
+ libcommons-beanutils-java (>= 1.7.0),
+ libcommons-compress-java
Standards-Version: 3.8.1
Package: liblucene2-java
@@ -30,11 +31,12 @@ Depends: ${misc:Depends},
libjline-java (>= 0.9.5),
libcommons-digester-java (>= 1.7),
libregexp-java (>= 1.4),
- libdb4.6-java,
+ libdb4.7-java,
libdb-je-java (>= 3.2.68),
libcommons-collections3-java (>= 3.1),
libcommons-logging-java (>= 1.0.4),
- libcommons-beanutils-java (>= 1.7.0)
+ libcommons-beanutils-java (>= 1.7.0),
+ libcommons-compress-java
Conflicts: solr-common (< 1.2.0+ds2-3)
Description: Full-text search engine library for Java(TM)
Lucene is a full-text search engine for the Java(TM) programming language.
diff --git a/debian/patches/00list b/debian/patches/00list
index 5a182fb..e983181 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,11 +1,12 @@
01_remove_all_jarfiles.dpatch
10_fix-javacc-locations.dpatch
+11_run-javacc-for-contrib-queryparser.dpatch
30_fix-contrib-ant-libs.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
60_fix-contrib-lucli-libs.dpatch
61_lucli-script.dpatch
70_fix-contrib-regex-libs.dpatch
80_prevent-downloading-data-files.dpatch
-90_fix-invalid-tests.dpatch
diff --git a/debian/patches/11_run-javacc-for-contrib-queryparser.dpatch b/debian/patches/11_run-javacc-for-contrib-queryparser.dpatch
new file mode 100755
index 0000000..ffd65f1
--- /dev/null
+++ b/debian/patches/11_run-javacc-for-contrib-queryparser.dpatch
@@ -0,0 +1,96 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_run-javacc-for-contrib-queryparser.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 lucene2~/build.xml lucene2/build.xml
+--- lucene2~/build.xml 2009-08-20 23:05:16.000000000 +0200
++++ lucene2/build.xml 2009-08-20 23:05:18.000000000 +0200
+@@ -574,7 +574,7 @@
+ </delete>
+ </target>
+
+- <target name="javacc" depends="clean-javacc,javacc-QueryParser,javacc-HTMLParser"/>
++ <target name="javacc" depends="clean-javacc,javacc-QueryParser,javacc-HTMLParser,javacc-contrib-queryparser"/>
+
+ <target name="javacc-QueryParser" depends="init,javacc-check" if="javacc.present">
+ <invoke-javacc target="src/java/org/apache/lucene/queryParser/QueryParser.jj"
+@@ -588,6 +588,13 @@
+ />
+ </target>
+
++ <target name="javacc-contrib-queryparser" depends="init,javacc-check" if="javacc.present">
++ <ant target="javacc"
++ dir="contrib/queryparser"
++ antfile="build.xml"
++ />
++ </target>
++
+ <!-- ================================================================== -->
+ <!-- Build the JFlex files into the source tree -->
+ <!-- ================================================================== -->
+diff -urNad lucene2~/contrib/queryparser/build.xml lucene2/contrib/queryparser/build.xml
+--- lucene2~/contrib/queryparser/build.xml 2009-08-20 23:05:16.000000000 +0200
++++ lucene2/contrib/queryparser/build.xml 2009-08-20 23:06:20.000000000 +0200
+@@ -35,6 +35,59 @@
+ <invoke-javacc target="src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj"
+ outputDir="src/java/org/apache/lucene/queryParser/standard/parser"
+ />
++ <replaceregexp file="src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java"
++ match="public class ParseException extends Exception"
++ replace="public class ParseException extends QueryNodeParseException"
++ flags="g"
++ byline="false"/>
++ <replaceregexp file="src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java"
++ match="package org.apache.lucene.queryParser.standard.parser;"
++ replace="package org.apache.lucene.queryParser.standard.parser;
++
++import org.apache.lucene.messages.Message;
++import org.apache.lucene.messages.MessageImpl;
++import org.apache.lucene.queryParser.core.*;
++import org.apache.lucene.queryParser.core.messages.*;"
++ flags="g"
++ byline="false"/>
++ <replaceregexp file="src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java"
++ match="^ public ParseException\(Token currentTokenVal.*$(\s\s[^}].*\n)* \}"
++ replace=" public ParseException(Token currentTokenVal,
++ int[][] expectedTokenSequencesVal, String[] tokenImageVal) {
++ super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, initialise(
++ currentTokenVal, expectedTokenSequencesVal, tokenImageVal)));
++ this.currentToken = currentTokenVal;
++ this.expectedTokenSequences = expectedTokenSequencesVal;
++ this.tokenImage = tokenImageVal;
++ }"
++ flags="gm"
++ byline="false"/>
++ <replaceregexp file="src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java"
++ match="^ public ParseException\(String message.*$(\s\s[^}].*\n)* \}"
++ replace=" public ParseException(Message message) {
++ super(message);
++ }"
++ flags="gm"
++ byline="false"/>
++ <replaceregexp file="src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java"
++ match="^ public ParseException\(\).*$(\s\s[^}].*\n)* \}"
++ replace=" public ParseException() {
++ super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, "Error"));
++ }"
++ flags="gm"
++ byline="false"/>
++ <replaceregexp file="src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java"
++ match="^ public String getMessage\(\).*$(\s\s\s\s[^}].*\n)* \}"
++ replace=" private static String initialise(Token currentToken,
++ int[][] expectedTokenSequences, String[] tokenImage) {
++ String eol = System.getProperty("line.separator", "\n");"
++ flags="gm"
++ byline="false"/>
++ <replaceregexp file="src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java"
++ match="\s*protected String add_escapes.*"
++ replace=" static private String add_escapes(String str) {"
++ flags="g"
++ byline="false"/>
+ </target>
+
+ </project>
diff --git a/debian/patches/40_fix-contrib-benchmark-libs.dpatch b/debian/patches/40_fix-contrib-benchmark-libs.dpatch
index 97ed45f..f6bf359 100755
--- a/debian/patches/40_fix-contrib-benchmark-libs.dpatch
+++ b/debian/patches/40_fix-contrib-benchmark-libs.dpatch
@@ -1,47 +1,27 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_fix-contrib-benchmark-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+## 39_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: Link contrib/benchmark to the libraries from /usr/share/java instead of
-## DP: to the (removed) libraries from lib/
+## DP: No description.
@DPATCH@
-diff -urNad lucene2-2.3.0~/contrib/benchmark/build.xml lucene2-2.3.0/contrib/benchmark/build.xml
---- lucene2-2.3.0~/contrib/benchmark/build.xml 2008-01-26 15:45:55.000000000 +0530
-+++ lucene2-2.3.0/contrib/benchmark/build.xml 2008-01-26 15:55:12.000000000 +0530
-@@ -100,23 +100,23 @@
- <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="xercesImpl.jar" value="xerces-2.9.0.jar"/>
-- <property name="xml-apis.jar" value="xml-apis-2.9.0.jar"/>
-+ <property name="digester.jar" value="commons-digester.jar"/>
-+ <property name="collections.jar" value="commons-collections.jar"/>
-+ <property name="logging.jar" value="commons-logging.jar"/>
-+ <property name="bean-utils.jar" value="commons-beanutils.jar"/>
-+ <property name="xercesImpl.jar" value="xercesImpl.jar"/>
-+ <property name="xml-apis.jar" value="xml-apis.jar"/>
-
- <path id="classpath">
- <pathelement path="${common.dir}/build/classes/java"/>
- <pathelement path="${common.dir}/build/classes/demo"/>
+diff -urNad lucene2~/contrib/benchmark/build.xml lucene2/contrib/benchmark/build.xml
+--- lucene2~/contrib/benchmark/build.xml 2009-08-20 09:34:18.000000000 +0200
++++ lucene2/contrib/benchmark/build.xml 2009-08-20 09:35:09.000000000 +0200
+@@ -107,9 +107,13 @@
<pathelement path="${common.dir}/build/contrib/highlighter/classes/java"/>
-- <pathelement path="lib/${digester.jar}"/>
-- <pathelement path="lib/${collections.jar}"/>
-- <pathelement path="lib/${logging.jar}"/>
-- <pathelement path="lib/${bean-utils.jar}"/>
-- <pathelement path="lib/${xercesImpl.jar}"/>
-- <pathelement path="lib/${xml-apis.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}"/>
-+ <pathelement path="/usr/share/java/${xercesImpl.jar}"/>
-+ <pathelement path="/usr/share/java/${xml-apis.jar}"/>
+ <pathelement path="${common.dir}/build/contrib/memory/classes/java"/>
+ <pathelement path="${common.dir}/build/contrib/fast-vector-highlighter/classes/java"/>
+- <fileset dir="lib">
+- <include name="**/*.jar"/>
+- </fileset>
++ <pathelement path="/usr/share/java/commons-digester.jar"/>
++ <pathelement path="/usr/share/java/commons-collections.jar"/>
++ <pathelement path="/usr/local/share/java/commons-compress.jar"/>
++ <pathelement path="/usr/share/java/commons-logging.jar"/>
++ <pathelement path="/usr/share/java/commons-beanutils.jar"/>
++ <pathelement path="/usr/share/java/xercesImpl.jar"/>
++ <pathelement path="/usr/share/java/xml-apis.jar"/>
</path>
<path id="run.classpath">
<path refid="classpath"/>
diff --git a/debian/patches/45_fix-contrib-collation-libs.dpatch b/debian/patches/45_fix-contrib-collation-libs.dpatch
new file mode 100755
index 0000000..94df7f4
--- /dev/null
+++ b/debian/patches/45_fix-contrib-collation-libs.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 45_fix-contrib-collation-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 lucene2~/contrib/collation/build.xml lucene2/contrib/collation/build.xml
+--- lucene2~/contrib/collation/build.xml 2009-08-19 20:22:41.000000000 +0200
++++ lucene2/contrib/collation/build.xml 2009-08-20 11:16:40.000000000 +0200
+@@ -26,7 +26,7 @@
+
+
+ <path id="additional.dependencies">
+- <fileset dir="lib" includes="icu4j-*.jar"/>
++ <pathelement location="/usr/share/java/icu4j.jar"/>
+ <pathelement location="../../build/contrib/misc/classes/java"/>
+ </path>
+
diff --git a/debian/patches/50_fix-contrib-db-libs.dpatch b/debian/patches/50_fix-contrib-db-libs.dpatch
index 8223fc7..4ae6715 100755
--- a/debian/patches/50_fix-contrib-db-libs.dpatch
+++ b/debian/patches/50_fix-contrib-db-libs.dpatch
@@ -1,29 +1,28 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_fix-contrib-db-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+## 49_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: Link contrib/db/bdb to the libraries from /usr/share/java instead of
-## DP: to the (removed) libraries from lib/
+## DP: No description.
@DPATCH@
-diff -urNad 2.2.0~/contrib/db/bdb/build.xml 2.2.0/contrib/db/bdb/build.xml
---- 2.2.0~/contrib/db/bdb/build.xml 2007-06-17 07:20:55.000000000 +0200
-+++ 2.2.0/contrib/db/bdb/build.xml 2007-09-04 11:28:03.000000000 +0200
+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 @@
Lucene Berkeley DB integration
</description>
-- <property name="db.version" value="4.3.29" />
+- <property name="db.version" value="4.7.25" />
-
<path id="db.jar">
- <pathelement location="lib/db-${db.version}.jar" />
-+ <pathelement location="/usr/share/java/libdb4.6-java.jar" />
++ <pathelement location="/usr/share/java/libdb4.7-java.jar" />
</path>
<available classname="com.sleepycat.db.internal.Db" property="db.jar.exists">
-@@ -23,12 +21,6 @@
-
- <import file="../../contrib-build.xml" />
+@@ -30,12 +28,6 @@
+ <pathelement location="${build.dir}/classes/java"/>
+ </path>
- <target name="get-db-jar" unless="db.jar.exists">
- <mkdir dir="lib" />
@@ -34,7 +33,7 @@ diff -urNad 2.2.0~/contrib/db/bdb/build.xml 2.2.0/contrib/db/bdb/build.xml
<target name="sanity-load-lib" depends="compile-test">
<java classname="org.apache.lucene.store.db.SanityLoadLibrary"
classpathref="junit.classpath"
-@@ -55,7 +47,6 @@
+@@ -62,7 +54,6 @@
<antcall target="common.test" inheritAll="true" inheritRefs="true" />
</target>
diff --git a/debian/patches/55_fix-contrib-db-je-libs.dpatch b/debian/patches/55_fix-contrib-db-je-libs.dpatch
index 1745a41..6b36c90 100755
--- a/debian/patches/55_fix-contrib-db-je-libs.dpatch
+++ b/debian/patches/55_fix-contrib-db-je-libs.dpatch
@@ -1,29 +1,25 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 55_fix-contrib-db-jre-compilation.dpatch by <varun at debian.org>
+## 54_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: Link contrib/db/bdb-je to the libraries from /usr/share/java instead of
-## DP: to the (removed) libraries from lib/
+## DP: No description.
@DPATCH@
-diff -urNad lucene2-2.2.0~/contrib/db/bdb-je/build.xml lucene2-2.2.0/contrib/db/bdb-je/build.xml
---- lucene2-2.2.0~/contrib/db/bdb-je/build.xml 2007-06-17 10:50:55.000000000 +0530
-+++ lucene2-2.2.0/contrib/db/bdb-je/build.xml 2008-01-26 15:14:11.000000000 +0530
-@@ -5,10 +5,8 @@
- Lucene Berkeley DB Java Edition integration
- </description>
+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" />
-- <property name="je.version" value="2.0.90" />
--
<path id="je.jar">
-- <pathelement location="lib/je-${je.version}/lib/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">
-@@ -23,17 +21,5 @@
-
- <import file="../../contrib-build.xml" />
+@@ -30,17 +30,5 @@
+ <pathelement location="${build.dir}/classes/java"/>
+ </path>
- <target name="get-je-jar" unless="je.jar.exists">
- <mkdir dir="lib" />
@@ -31,7 +27,7 @@ diff -urNad lucene2-2.2.0~/contrib/db/bdb-je/build.xml lucene2-2.2.0/contrib/db/
- dest="lib/je-${je.version}.zip" />
- <unzip src="lib/je-${je.version}.zip" dest="lib">
- <patternset>
-- <include name="je-${je.version}/lib/je.jar" />
+- <include name="je-${je.version}/lib/je-${je.version}.jar" />
- </patternset>
- </unzip>
- </target>
diff --git a/debian/patches/90_fix-invalid-tests.dpatch b/debian/patches/90_fix-invalid-tests.dpatch
deleted file mode 100755
index 91a59b7..0000000
--- a/debian/patches/90_fix-invalid-tests.dpatch
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_fix-invalid-tests.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Upstream also has this patch (revision 731727), with the comment
-## DP: "remove 2 invalid tests of modified utf8 null byte". See
-## DP: also the discussion at
-## DP: http://mail-archives.apache.org/mod_mbox/lucene-java-dev/200901.mbox/%3CEF6C8235-660E-4EC9-A1E6-A7270916BABF@mikemccandless.com%3E
-
- at DPATCH@
-diff -urNad lucene2~/src/test/org/apache/lucene/index/TestIndexInput.java lucene2/src/test/org/apache/lucene/index/TestIndexInput.java
---- lucene2~/src/test/org/apache/lucene/index/TestIndexInput.java 2008-10-01 13:58:22.000000000 +0200
-+++ lucene2/src/test/org/apache/lucene/index/TestIndexInput.java 2009-02-26 20:54:41.000000000 +0100
-@@ -59,12 +59,6 @@
- 0x01, 0x00,
- 0x08, 'L', 'u', 0x00, 'c', 'e', 0x00, 'n', 'e',
-
-- // Modified UTF-8 null bytes
-- 0x02, (byte) 0xC0, (byte) 0x80,
-- 0x0A, 'L', 'u', (byte) 0xC0, (byte) 0x80,
-- 'c', 'e', (byte) 0xC0, (byte) 0x80,
-- 'n', 'e',
--
- });
-
- assertEquals(128,is.readVInt());
-@@ -85,9 +79,6 @@
-
- assertEquals("\u0000",is.readString());
- assertEquals("Lu\u0000ce\u0000ne",is.readString());
--
-- assertEquals("\u0000",is.readString());
-- assertEquals("Lu\u0000ce\u0000ne",is.readString());
- }
-
- /**
diff --git a/debian/rules b/debian/rules
index fdea32d..e517413 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,7 @@ remove-source:
rm -f common-build.xml
rm -f *.txt
rm -f *stamp
+ rm -f *pom.xml.template
rm -rf debian/patched
rm -rf build dist docs example lib src contrib
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git
More information about the pkg-java-commits
mailing list