[pkg-java] r10782 - in trunk/lucene2/debian: . patches
Jan-Pascal van Best
janpascal-guest at alioth.debian.org
Thu Oct 8 18:58:33 UTC 2009
Author: janpascal-guest
Date: 2009-10-08 18:58:33 +0000 (Thu, 08 Oct 2009)
New Revision: 10782
Added:
trunk/lucene2/debian/patches/11_fix-javacc-generated-files.dpatch
Modified:
trunk/lucene2/debian/ant.properties
trunk/lucene2/debian/changelog
trunk/lucene2/debian/get-orig-source.sh
trunk/lucene2/debian/patches/00list
trunk/lucene2/debian/patches/11_run-javacc-for-contrib-queryparser.dpatch
trunk/lucene2/debian/rules
Log:
Changes for lucene 2.9.0 final
Modified: trunk/lucene2/debian/ant.properties
===================================================================
--- trunk/lucene2/debian/ant.properties 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/lucene2/debian/ant.properties 2009-10-08 18:58:33 UTC (rev 10782)
@@ -2,7 +2,7 @@
# Version number for upstream source; errors in the
# upstream source require that it be overridden.
-version=2.9.0~rc0
+version=2.9.0
# javacc settings used by Lucene build
javacc.home=/usr/share/java
Modified: trunk/lucene2/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/lucene2/debian/changelog 2009-10-08 18:58:33 UTC (rev 10782)
@@ -1,10 +1,10 @@
-lucene2 (2.9.0~rc0+ds1-1) unstable; urgency=low
+lucene2 (2.9.0+ds1-1) unstable; urgency=low
* New upstream version
* Updated Debian patches for Lucene 2.9
* Bumped standards version to 3.8.2 (no changes needed)
- -- Jan-Pascal van Best <janpascal at vanbest.org> Fri, 21 Aug 2009 13:51:10 +0200
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Sat, 26 Sep 2009 21:24:03 +0200
lucene2 (2.4.1+ds1-1) unstable; urgency=low
Modified: trunk/lucene2/debian/get-orig-source.sh
===================================================================
--- trunk/lucene2/debian/get-orig-source.sh 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/lucene2/debian/get-orig-source.sh 2009-10-08 18:58:33 UTC (rev 10782)
@@ -4,13 +4,11 @@
URL=`echo $DEHS | xsltproc debian/uscan-url.xslt -`
VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -`
-UPSTREAM_VERSION="2.9-dev"
-VERSION="2.9.0~rc0"
DEBIAN_SOURCE_VERSION="$VERSION+ds1"
DESTDIR=$PWD/..
-SOURCEFILE=$DESTDIR/lucene-$UPSTREAM_VERSION-src.tar.gz
-SIGFILE=$DESTDIR/lucene-$UPSTREAM_VERSION-src.tar.gz.asc
+SOURCEFILE=$DESTDIR/lucene-$VERSION-src.tar.gz
+SIGFILE=$DESTDIR/lucene-$VERSION-src.tar.gz.asc
SOURCETAR=$DESTDIR/lucene2_$DEBIAN_SOURCE_VERSION.orig.tar
KEYURL="http://www.apache.org/dist/lucene/java/KEYS"
@@ -22,7 +20,7 @@
wget "$URL" -O $SOURCEFILE
fi
-#wget "$URL.asc" -O $SIGFILE
+wget "$URL.asc" -O $SIGFILE
# If necessary, recreate keyring used for signing
# Only do this if the keyring is not yet downloaded
@@ -38,7 +36,7 @@
# Check signature
gpgv --quiet --keyring $KEYRING $SIGFILE $SOURCEFILE
-echo "Check whether the archive has been signed by Michael McCandless (CODE SIGNING KEY) <mikemccand at apache.org>, key ID 6E68DA61"
+echo "Check whether the archive has been signed by Mark Robert Miller (CODE SIGNING KEY) <markrmiller at apache.org>, key ID EB0199F8"
# Repackage upstream source file without the third party jars
TEMPDIR=`mktemp -d`
Modified: trunk/lucene2/debian/patches/00list
===================================================================
--- trunk/lucene2/debian/patches/00list 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/lucene2/debian/patches/00list 2009-10-08 18:58:33 UTC (rev 10782)
@@ -1,6 +1,6 @@
01_remove_all_jarfiles.dpatch
10_fix-javacc-locations.dpatch
-11_run-javacc-for-contrib-queryparser.dpatch
+11_fix-javacc-generated-files.dpatch
30_fix-contrib-ant-libs.dpatch
40_fix-contrib-benchmark-libs.dpatch
45_fix-contrib-collation-libs.dpatch
Added: trunk/lucene2/debian/patches/11_fix-javacc-generated-files.dpatch
===================================================================
--- trunk/lucene2/debian/patches/11_fix-javacc-generated-files.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/11_fix-javacc-generated-files.dpatch 2009-10-08 18:58:33 UTC (rev 10782)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_fix-javacc-generated-files.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/queryparser/build.xml lucene2/contrib/queryparser/build.xml
+--- lucene2~/contrib/queryparser/build.xml 2009-10-08 18:23:39.000000000 +0200
++++ lucene2/contrib/queryparser/build.xml 2009-10-08 18:24:45.000000000 +0200
+@@ -54,8 +54,8 @@
+ 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)));
++ super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, new Object[]{initialise(
++ currentTokenVal, expectedTokenSequencesVal, tokenImageVal)}));
+ this.currentToken = currentTokenVal;
+ this.expectedTokenSequences = expectedTokenSequencesVal;
+ this.tokenImage = tokenImageVal;
+@@ -72,7 +72,7 @@
+ <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"));
++ super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, new Object[]{"Error"}));
+ }"
+ flags="gm"
+ byline="false"/>
+@@ -88,6 +88,11 @@
+ replace=" static private String add_escapes(String str) {"
+ flags="g"
+ byline="false"/>
++ <replaceregexp file="src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java"
++ match="Message message = new MessageImpl\(QueryParserMessages.INVALID_SYNTAX_CANNOT_PARSE, query, tme.getMessage\(\)\);"
++ replace="Message message = new MessageImpl(QueryParserMessages.INVALID_SYNTAX_CANNOT_PARSE, new Object[]{query, tme.getMessage()});"
++ flags="g"
++ byline="false"/>
+ </target>
+
+ </project>
Property changes on: trunk/lucene2/debian/patches/11_fix-javacc-generated-files.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/lucene2/debian/patches/11_run-javacc-for-contrib-queryparser.dpatch
===================================================================
--- trunk/lucene2/debian/patches/11_run-javacc-for-contrib-queryparser.dpatch 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/lucene2/debian/patches/11_run-javacc-for-contrib-queryparser.dpatch 2009-10-08 18:58:33 UTC (rev 10782)
@@ -8,7 +8,16 @@
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 @@
+@@ -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>
Modified: trunk/lucene2/debian/rules
===================================================================
--- trunk/lucene2/debian/rules 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/lucene2/debian/rules 2009-10-08 18:58:33 UTC (rev 10782)
@@ -15,13 +15,13 @@
DEB_ANT_BUILD_TARGET := javacc jar-core build-contrib war-demo javadocs
DEB_ANT_CHECK_TARGET := test
-DEB_ANT_CLEAN_TARGET := clean
+DEB_ANT_CLEAN_TARGET := clean clean-javacc
# Needed for running javacc and the unit tests
DEB_JARS = ant-nodeps ant-junit junit
# Upstream Lucene name
-UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | grep -o "^[^+]*")
+UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | grep -o "^[^+]*" | sed -e "s/~/-/" )
UPSTREAM_BASENAME := lucene-$(UPSTREAM_VERSION)
CHANGESFILE = ../lucene2_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
@@ -40,7 +40,8 @@
rm -f debian/KEYS
# remove all javacc-generated files from src and contrib, except those
# that are not regenerated properly
- fgrep -Rl "Generated By:JavaCC:" $(CURDIR)/src/ $(CURDIR)/contrib/ | grep -v analysis/standard/ParseException.java\\\|precedence\\\|surround | xargs rm -f
+ # Now done in build.xml target clean-javacc
+ #fgrep -Rl "Generated By:JavaCC:" $(CURDIR)/src/ $(CURDIR)/contrib/ | grep -v analysis/standard/ParseException.java\\\|precedence\\\|surround | xargs rm -f
install/liblucene2-java::
# Install the libraries into the liblucene2-java package
More information about the pkg-java-commits
mailing list