[pkg-java] r11021 - in trunk/lucene2/debian: . patches patches/old
Jan-Pascal van Best
janpascal-guest at alioth.debian.org
Thu Nov 5 10:17:55 UTC 2009
Author: janpascal-guest
Date: 2009-11-05 10:17:54 +0000 (Thu, 05 Nov 2009)
New Revision: 11021
Added:
trunk/lucene2/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch
trunk/lucene2/debian/patches/81_disable-test-tag-backcompat-tests.dpatch
trunk/lucene2/debian/patches/old/11_run-javacc-for-contrib-queryparser.dpatch
Removed:
trunk/lucene2/debian/patches/11_run-javacc-for-contrib-queryparser.dpatch
Modified:
trunk/lucene2/debian/changelog
trunk/lucene2/debian/patches/00list
Log:
Move unused patch to old/; add patches to fix a contrib/ant test when running with
pbuilder (it urldecoded a local path which contains a '+' sign from the Debian
version number) and to disable back compat tests (they download older revisions
from the upstream svn).
Modified: trunk/lucene2/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog 2009-11-05 07:31:58 UTC (rev 11020)
+++ trunk/lucene2/debian/changelog 2009-11-05 10:17:54 UTC (rev 11021)
@@ -1,3 +1,11 @@
+lucene2 (2.9.0+ds1-3) UNRELEASED; urgency=low
+
+ * Fix contrib/ant unit test for running under pbuilder
+ * Disable backwards compatibility tests because these download older versions
+ from the Apache Lucene svn repository
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Thu, 05 Nov 2009 11:07:28 +0100
+
lucene2 (2.9.0+ds1-2) unstable; urgency=low
* Updated Java source and target version to 1.5 (Closes: #549812)
Modified: trunk/lucene2/debian/patches/00list
===================================================================
--- trunk/lucene2/debian/patches/00list 2009-11-05 07:31:58 UTC (rev 11020)
+++ trunk/lucene2/debian/patches/00list 2009-11-05 10:17:54 UTC (rev 11021)
@@ -3,6 +3,7 @@
11_fix-javacc-generated-files.dpatch
20_fix-java-compiler-version.dpatch
30_fix-contrib-ant-libs.dpatch
+31_fix-contrib-ant-test-wrong-encoding.dpatch
40_fix-contrib-benchmark-libs.dpatch
45_fix-contrib-collation-libs.dpatch
50_fix-contrib-db-libs.dpatch
@@ -11,3 +12,4 @@
61_lucli-script.dpatch
70_fix-contrib-regex-libs.dpatch
80_prevent-downloading-data-files.dpatch
+81_disable-test-tag-backcompat-tests.dpatch
Deleted: trunk/lucene2/debian/patches/11_run-javacc-for-contrib-queryparser.dpatch
===================================================================
--- trunk/lucene2/debian/patches/11_run-javacc-for-contrib-queryparser.dpatch 2009-11-05 07:31:58 UTC (rev 11020)
+++ trunk/lucene2/debian/patches/11_run-javacc-for-contrib-queryparser.dpatch 2009-11-05 10:17:54 UTC (rev 11021)
@@ -1,105 +0,0 @@
-#! /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
-@@ -568,13 +568,16 @@
- <fileset dir="src/java/org/apache/lucene/queryParser" includes="*.java">
- <containsregexp expression="Generated.*By.*JavaCC"/>
- </fileset>
-+ <fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser" includes="*.java">
-+ <containsregexp expression="Generated.*By.*JavaCC"/>
-+ </fileset>
- <fileset dir="src/demo/org/apache/lucene/demo/html" includes="*.java">
- <containsregexp expression="Generated.*By.*JavaCC"/>
- </fileset>
- </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>
Added: trunk/lucene2/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch
===================================================================
--- trunk/lucene2/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch 2009-11-05 10:17:54 UTC (rev 11021)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 31_fix-contrib-ant-test-wrong-encoding.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The URL decoding caused the test to fail when building with pbuilder,
+## DP: because the '+' sign in the Debian version number was converted to
+## DP: a space. This patch removes the URL decoding.
+
+ at DPATCH@
+diff -urNad lucene2~/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java lucene2/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java
+--- lucene2~/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java 2009-06-27 12:58:40.000000000 +0200
++++ lucene2/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java 2009-11-05 09:34:23.000000000 +0100
+@@ -33,7 +33,7 @@
+ String fullname =
+ this.getClass().getResource(filename).getFile();
+
+- File file = new File(URLDecoder.decode(fullname, "UTF-8"));
++ File file = new File(fullname);
+
+ return file;
+ }
Property changes on: trunk/lucene2/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/lucene2/debian/patches/81_disable-test-tag-backcompat-tests.dpatch
===================================================================
--- trunk/lucene2/debian/patches/81_disable-test-tag-backcompat-tests.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/81_disable-test-tag-backcompat-tests.dpatch 2009-11-05 10:17:54 UTC (rev 11021)
@@ -0,0 +1,72 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 81_disable-test-tag-backcompat-tests.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-09-18 01:03:43.000000000 +0200
++++ lucene2/build.xml 2009-11-05 10:43:38.000000000 +0100
+@@ -80,8 +80,8 @@
+ <target name="test-core" depends="common.test"
+ description="Runs unit tests for the core Lucene code"
+ />
+- <target name="test" depends="test-core, test-contrib, test-tag"
+- description="Runs all unit tests (core, contrib and back-compat)"
++ <target name="test" depends="test-core, test-contrib"
++ description="Runs all unit tests (core and contrib)"
+ />
+
+ <property name="tag" value="${compatibility.tag}"/>
+@@ -100,50 +100,6 @@
+ <pathelement path="${java.class.path}"/>
+ </path>
+
+- <target name="download-tag"
+- description="Downloads a previous Lucene version. Specify tag version like this: -Dtag=lucene_2_4_back_compat_tests_20090127">
+- <sequential>
+- <mkdir dir="${tags.dir}/${tag}"/>
+- <exec dir="${tags.dir}/${tag}" executable="${svn.exe}"
+- failifexecutionfails="false">
+- <arg line="checkout http://svn.apache.org/repos/asf/lucene/java/tags/${tag}/src/"/>
+- </exec>
+- </sequential>
+- </target>
+-
+- <target name="test-tag" depends="download-tag, compile-core, compile-demo, jar-core"
+- description="Runs tests of a previous Lucene version. Specify tag version like this: -Dtag=branches/lucene_2_4_back_compat_tests">
+- <sequential>
+- <available property="tag.available" file="${tags.dir}/${tag}/src/test" />
+-
+- <fail unless="tag.available">
+- Specified tag '${tag}' could not be found in directory '${tags.dir}/${tag}'.
+- </fail>
+- <mkdir dir="${build.dir}/${tag}"/>
+-
+- <!-- first compile tag classes -->
+- <compile
+- srcdir="${tags.dir}/${tag}/src/java"
+- destdir="${build.dir}/${tag}/classes/java">
+- <classpath refid="tag.classpath"/>
+- </compile>
+-
+- <!-- compile jar for tag -->
+- <jarify basedir="${build.dir}/${tag}/classes/java"
+- destfile="${build.dir}/${tag}/${tag}.jar" />
+-
+- <!-- compile tag tests against tag jar -->
+- <compile-test-macro srcdir="${tags.dir}/${tag}/src/test" destdir="${build.dir}/${tag}/classes/test"
+- test.classpath="tag.test.classpath"/>
+-
+- <!-- run tag tests against trunk jar -->
+- <test-macro dataDir="${tags.dir}/${tag}/src/test"
+- tempDir="${build.dir}/${tag}"
+- junit.classpath="tag.junit.classpath"/>
+- </sequential>
+- </target>
+-
+-
+ <target name="clean-tags"
+ description="Removes contents of the tags directory">
+ <delete dir="${tags.dir}"/>
Property changes on: trunk/lucene2/debian/patches/81_disable-test-tag-backcompat-tests.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Copied: trunk/lucene2/debian/patches/old/11_run-javacc-for-contrib-queryparser.dpatch (from rev 10782, trunk/lucene2/debian/patches/11_run-javacc-for-contrib-queryparser.dpatch)
===================================================================
--- trunk/lucene2/debian/patches/old/11_run-javacc-for-contrib-queryparser.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/old/11_run-javacc-for-contrib-queryparser.dpatch 2009-11-05 10:17:54 UTC (rev 11021)
@@ -0,0 +1,105 @@
+#! /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
+@@ -568,13 +568,16 @@
+ <fileset dir="src/java/org/apache/lucene/queryParser" includes="*.java">
+ <containsregexp expression="Generated.*By.*JavaCC"/>
+ </fileset>
++ <fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser" includes="*.java">
++ <containsregexp expression="Generated.*By.*JavaCC"/>
++ </fileset>
+ <fileset dir="src/demo/org/apache/lucene/demo/html" includes="*.java">
+ <containsregexp expression="Generated.*By.*JavaCC"/>
+ </fileset>
+ </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>
More information about the pkg-java-commits
mailing list