[pkg-java] r11065 - in tags/lucene2: . 2.9.1+ds1-1/debian 2.9.1+ds1-1/debian/patches 2.9.1+ds1-1/debian/patches/old

Jan-Pascal van Best janpascal-guest at alioth.debian.org
Sat Nov 14 13:06:37 UTC 2009


Author: janpascal-guest
Date: 2009-11-14 13:06:37 +0000 (Sat, 14 Nov 2009)
New Revision: 11065

Added:
   tags/lucene2/2.9.1+ds1-1/
   tags/lucene2/2.9.1+ds1-1/debian/ant.properties
   tags/lucene2/2.9.1+ds1-1/debian/changelog
   tags/lucene2/2.9.1+ds1-1/debian/control
   tags/lucene2/2.9.1+ds1-1/debian/copyright.old
   tags/lucene2/2.9.1+ds1-1/debian/get-orig-source.sh
   tags/lucene2/2.9.1+ds1-1/debian/patches/00list
   tags/lucene2/2.9.1+ds1-1/debian/patches/11_fix-javacc-generated-files.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/patches/20_fix-java-compiler-version.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/patches/40_fix-contrib-benchmark-libs.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/patches/45_fix-contrib-collation-libs.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/patches/50_fix-contrib-db-libs.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/patches/55_fix-contrib-db-je-libs.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/patches/61_lucli-script.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/patches/81_disable-test-tag-backcompat-tests.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/patches/old/11_run-javacc-for-contrib-queryparser.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/rules
Removed:
   tags/lucene2/2.9.1+ds1-1/debian/ant.properties
   tags/lucene2/2.9.1+ds1-1/debian/changelog
   tags/lucene2/2.9.1+ds1-1/debian/control
   tags/lucene2/2.9.1+ds1-1/debian/copyright
   tags/lucene2/2.9.1+ds1-1/debian/get-orig-source.sh
   tags/lucene2/2.9.1+ds1-1/debian/patches/00list
   tags/lucene2/2.9.1+ds1-1/debian/patches/40_fix-contrib-benchmark-libs.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/patches/50_fix-contrib-db-libs.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/patches/55_fix-contrib-db-je-libs.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/patches/61_lucli-script.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/patches/81_prevent-network-access.dpatch
   tags/lucene2/2.9.1+ds1-1/debian/rules
Log:
Tagged lucene release 2.9.1+ds1-1

Deleted: tags/lucene2/2.9.1+ds1-1/debian/ant.properties
===================================================================
--- trunk/lucene2/debian/ant.properties	2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.9.1+ds1-1/debian/ant.properties	2009-11-14 13:06:37 UTC (rev 11065)
@@ -1,17 +0,0 @@
-# Ant properties file for Debian lucene source package
-
-# Version number for upstream source; errors in the 
-# upstream source require that it be overridden.
-version=2.4.0
-
-# javacc settings used by Lucene build
-javacc.home=/usr/share/java
-javacc.jar=/usr/share/java/javacc.jar
-
-# javac settings used by Lucene compilation
-javac.debug=on
-javac.verbose=yes
-# build.rmic=kaffe
-build.compiler=javac1.5
-compile.debug=on
-compile.optimize=on

Copied: tags/lucene2/2.9.1+ds1-1/debian/ant.properties (from rev 11029, trunk/lucene2/debian/ant.properties)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/ant.properties	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/ant.properties	2009-11-14 13:06:37 UTC (rev 11065)
@@ -0,0 +1,17 @@
+# Ant properties file for Debian lucene source package
+
+# Version number for upstream source; errors in the 
+# upstream source require that it be overridden.
+version=2.9.1
+
+# javacc settings used by Lucene build
+javacc.home=/usr/share/java
+javacc.jar=/usr/share/java/javacc.jar
+
+# javac settings used by Lucene compilation
+javac.debug=on
+javac.verbose=yes
+# build.rmic=kaffe
+build.compiler=javac1.5
+compile.debug=on
+compile.optimize=on

Deleted: tags/lucene2/2.9.1+ds1-1/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog	2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.9.1+ds1-1/debian/changelog	2009-11-14 13:06:37 UTC (rev 11065)
@@ -1,93 +0,0 @@
-lucene2 (2.4.0+ds1-2) unstable; urgency=low
-
-  * switch to libdb4.6-java as we need the armel binary of it since OOo/armel
-    needs us 
-  * add myself to Uploaders:
-
- -- Rene Engelhard <rene at debian.org>  Mon, 24 Nov 2008 00:18:01 +0100
-
-lucene2 (2.4.0+ds1-1) unstable; urgency=low
-
-  * New upstream version (2 patches patched)
-  * Add DM-Upload-Allowed: Yes to debian/control
-
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Sat, 11 Oct 2008 22:46:02 +0200
-
-lucene2 (2.3.2+ds1-1) unstable; urgency=low
-
-  * New upstream release 
-  * Use openjdk to build lucene2, move to main (Closes: #488895)
-  * Update TODO.Debian to reflect move to openjdk
-  * Update README.Debian to reflect inclusion of bdb-je (in 2.3.0+ds1-1)
-  * Bump Standards-Version to 3.8.0
-  * Update debian/copyright to refer to the text of the Apache license in
-    /usr/share/common-licenses/
-  * Clean up some cruft (failed-unittest-log.txt, KEYS, rules-backup) per
-    suggestion of Jeff Breidenbach
-
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Mon, 28 Jul 2008 21:57:05 +0200
-
-lucene2 (2.3.1+ds1-1) unstable; urgency=low
-
-  [ Michael Koch ]
-  * Updated watch file to work with repackaged version number.
-
-  [ Jan-Pascal van Best ]
-  * New upstream release 
-
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Thu, 27 Mar 2008 06:47:48 +0100
-
-lucene2 (2.3.0+ds1-1) unstable; urgency=low
-
-  [ Varun Hiremath ]
-  * New upstream release
-  * Enable bdb-je integration (Closes: #450569)
-  * debian/patches:
-    - Remove 55_disable-db-jre-compilation.dpatch
-    + Add 55_fix-contrib-db-je-libs.dpatch to enable bdb-je integration
-  * Move the following patches to old dir as they are no longer applicable:
-    + old/20_remove-gdata-server.dpatch
-    + old/81_fix-javadocs-links.dpatch
-    + old/82_fix-javadoc-external-link-for-gcj.dpatch
-    + old/80_fix-javadocs-classpath.dpatch
-  * debian/control:
-    + Add libdb-je-java to Build-Depends-Indep
-    + Add Homepage header and replace XS-Vcs with Vcs
-    + Bump debhelper compat to 6
-    + Bump Standards-Version to 3.7.3
-
-  [ Jan-Pascal van Best ]
-  * Removed generated (javacc) files from orig.tar.gz.
-  * Updated Debian version to x.y.z+ds1-1, since it is a repackaged source
-  * Install the class documentation into the -doc package instead of into the
-    main package
-  * Added Debian packaging copyright information
-  * Added missing descriptions to patch files
-  * Prevent the test run to download anything, which would not work for
-    autobuilders
-
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 01 Feb 2008 14:18:11 +0100
-
-lucene2 (2.2.0-2) unstable; urgency=low
-
-  * Use libdb4.5-java instead of libdb4.3-java, which is removed from Debian.
-  * Move to cdbs
-  * Expanded man page a little
-
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 04 Sep 2007 21:02:06 +0200
-
-lucene2 (2.2.0-1) unstable; urgency=low
-
-  * New upstream release (2.2.0)
-  * Repackaged source tarball, removing third party jars
-  * Added links in lucene javadocs to locally installed ant and regexp javadocs
-  * Updated README.Debian for running the example webapp with tomcat5.5
-
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Sat, 14 Jul 2007 12:42:29 +0200
-
-lucene2 (2.1.0-1) unstable; urgency=low
-
-  * New upstream release (2.1.0)
-  * Fixes compilation of lucli, dbd, dbd-je, regex contrib jar files
-
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 10 Apr 2007 14:23:52 +0200

Copied: tags/lucene2/2.9.1+ds1-1/debian/changelog (from rev 11029, trunk/lucene2/debian/changelog)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/changelog	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/changelog	2009-11-14 13:06:37 UTC (rev 11065)
@@ -0,0 +1,168 @@
+lucene2 (2.9.1+ds1-1) unstable; urgency=low
+
+  * New upstream release 2.9.1
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 06 Nov 2009 21:22:26 +0100
+
+lucene2 (2.9.0+ds1-3) unstable; 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
+  * Moved a number of dependencies to Recommends: because they are only
+    dependencies of a contrib library:
+       libicu4j-java: contrib/collation
+       libjline-java: contrib/lucli
+       libjtidy-java: contrib/ant
+       libregexp-java: contrib/regex
+       libcommons-beanutils-java, libcommons-collections3-java,
+       libcommons-compress-java, libcommons-digester-java,
+       libcommons-logging-java: contrib/benchmark
+       libdb4.7-java, libdb-je-java: contrib/db
+  * Changed JRE depends to the -headless versions
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Thu, 05 Nov 2009 22:49:39 +0100
+
+lucene2 (2.9.0+ds1-2) unstable; urgency=low
+
+  * Updated Java source and target version to 1.5 (Closes: #549812)
+  * Added missing dependency on libicu4j-java (for contrib/collation)
+  * Added missing dependency on libjtidy-java (for contrib/ant)
+  * Fix lucli script (shebang line was places after the license block)
+  * Converted debian/copyright to machine-readable format
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Wed, 04 Nov 2009 10:27:47 +0100
+
+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.3 (no changes needed)
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 09 Oct 2009 16:02:03 +0200
+
+lucene2 (2.4.1+ds1-1) unstable; urgency=low
+
+  * New upstream version (2.4.1).
+  * Changed Section from "text" to the new section "java".
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 09 Jun 2009 14:24:27 +0200
+
+lucene2 (2.4.0+ds1-5) unstable; urgency=low
+
+  * Changed Breaks to Conflicts to prevent trouble with buildds still
+    running Etch.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Sun, 01 Mar 2009 07:31:37 +0100
+
+lucene2 (2.4.0+ds1-4) unstable; urgency=low
+
+  * Added a Breaks: control field to indicate incompatibility with versions
+    of solr-common before 1.2.0+ds2-3 (Closes: 516291).
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 27 Feb 2009 23:39:14 +0100
+
+lucene2 (2.4.0+ds1-3) unstable; urgency=low
+
+  * Re-enable Highlighter unit test because it no longer causes network access
+    (Closes: 50678).
+  * Added ${misc:Depends} dependencies to fix possible debhelper dependencies.
+  * Cleaned up package description of liblucene2-java (removed list of contrib
+    libraries)
+  * Removed two invalid tests also removed upstream (Closes: #516475).
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Thu, 26 Feb 2009 20:57:33 +0100
+
+lucene2 (2.4.0+ds1-2) unstable; urgency=low
+
+  * switch to libdb4.6-java as we need the armel binary of it since OOo/armel
+    needs us 
+  * add myself to Uploaders:
+
+ -- Rene Engelhard <rene at debian.org>  Mon, 24 Nov 2008 00:18:01 +0100
+
+lucene2 (2.4.0+ds1-1) unstable; urgency=low
+
+  * New upstream version (2 patches patched)
+  * Add DM-Upload-Allowed: Yes to debian/control
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Sat, 11 Oct 2008 22:46:02 +0200
+
+lucene2 (2.3.2+ds1-1) unstable; urgency=low
+
+  * New upstream release 
+  * Use openjdk to build lucene2, move to main (Closes: #488895)
+  * Update TODO.Debian to reflect move to openjdk
+  * Update README.Debian to reflect inclusion of bdb-je (in 2.3.0+ds1-1)
+  * Bump Standards-Version to 3.8.0
+  * Update debian/copyright to refer to the text of the Apache license in
+    /usr/share/common-licenses/
+  * Clean up some cruft (failed-unittest-log.txt, KEYS, rules-backup) per
+    suggestion of Jeff Breidenbach
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Mon, 28 Jul 2008 21:57:05 +0200
+
+lucene2 (2.3.1+ds1-1) unstable; urgency=low
+
+  [ Michael Koch ]
+  * Updated watch file to work with repackaged version number.
+
+  [ Jan-Pascal van Best ]
+  * New upstream release 
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Thu, 27 Mar 2008 06:47:48 +0100
+
+lucene2 (2.3.0+ds1-1) unstable; urgency=low
+
+  [ Varun Hiremath ]
+  * New upstream release
+  * Enable bdb-je integration (Closes: #450569)
+  * debian/patches:
+    - Remove 55_disable-db-jre-compilation.dpatch
+    + Add 55_fix-contrib-db-je-libs.dpatch to enable bdb-je integration
+  * Move the following patches to old dir as they are no longer applicable:
+    + old/20_remove-gdata-server.dpatch
+    + old/81_fix-javadocs-links.dpatch
+    + old/82_fix-javadoc-external-link-for-gcj.dpatch
+    + old/80_fix-javadocs-classpath.dpatch
+  * debian/control:
+    + Add libdb-je-java to Build-Depends-Indep
+    + Add Homepage header and replace XS-Vcs with Vcs
+    + Bump debhelper compat to 6
+    + Bump Standards-Version to 3.7.3
+
+  [ Jan-Pascal van Best ]
+  * Removed generated (javacc) files from orig.tar.gz.
+  * Updated Debian version to x.y.z+ds1-1, since it is a repackaged source
+  * Install the class documentation into the -doc package instead of into the
+    main package
+  * Added Debian packaging copyright information
+  * Added missing descriptions to patch files
+  * Prevent the test run to download anything, which would not work for
+    autobuilders
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 01 Feb 2008 14:18:11 +0100
+
+lucene2 (2.2.0-2) unstable; urgency=low
+
+  * Use libdb4.5-java instead of libdb4.3-java, which is removed from Debian.
+  * Move to cdbs
+  * Expanded man page a little
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 04 Sep 2007 21:02:06 +0200
+
+lucene2 (2.2.0-1) unstable; urgency=low
+
+  * New upstream release (2.2.0)
+  * Repackaged source tarball, removing third party jars
+  * Added links in lucene javadocs to locally installed ant and regexp javadocs
+  * Updated README.Debian for running the example webapp with tomcat5.5
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Sat, 14 Jul 2007 12:42:29 +0200
+
+lucene2 (2.1.0-1) unstable; urgency=low
+
+  * New upstream release (2.1.0)
+  * Fixes compilation of lucli, dbd, dbd-je, regex contrib jar files
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 10 Apr 2007 14:23:52 +0200

Deleted: tags/lucene2/2.9.1+ds1-1/debian/control
===================================================================
--- trunk/lucene2/debian/control	2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.9.1+ds1-1/debian/control	2009-11-14 13:06:37 UTC (rev 11065)
@@ -1,55 +0,0 @@
-Source: lucene2
-Section: text
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>, Barry Hawkins <barry at alltc.com>, 
- Jeff Breidenbach <jab at debian.org>, Michael Koch <konqueror at gmx.de>, Rene Engelhard <rene at debian.org>
-DM-Upload-Allowed: yes
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/lucene2/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/lucene2/
-Homepage: http://lucene.apache.org/java/
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 6), dpatch (>= 2.0),
- openjdk-6-jdk, 
- ant-optional, javacc, junit
-Build-Depends-Indep: libjtidy-java (>= 7),
- libjline-java (>= 0.9.5), 
- libcommons-digester-java (>= 1.7), 
- libregexp-java (>= 1.4), 
- libdb4.6-java,
- libdb-je-java (>= 3.2.68),
- libcommons-collections3-java (>= 3.1), 
- libcommons-logging-java (>= 1.0.4), 
- libcommons-beanutils-java (>= 1.7.0)
-Standards-Version: 3.8.0
-
-Package: liblucene2-java
-Architecture: all
-Depends: openjdk-6-jre | java5-runtime,
- libjtidy-java (>= 7),
- libjline-java (>= 0.9.5), 
- libcommons-digester-java (>= 1.7), 
- libregexp-java (>= 1.4), 
- libdb4.6-java,
- libdb-je-java (>= 3.2.68),
- libcommons-collections3-java (>= 3.1), 
- libcommons-logging-java (>= 1.0.4), 
- libcommons-beanutils-java (>= 1.7.0)
-Description: Full-text search engine library for Java(TM)
- Lucene is a full-text search engine for the Java(TM) programming language.
- Lucene is not a complete application, but rather a code library and API
- that can easily be used to add search capabilities to applications.
- .
- In addition to the Lucene core library, the following contributions are 
- also included: analyzers ant bdb bdb-je benchmark highlighter lucli 
- memory misc queries regex similarity snowball spellchecker surround swing 
- wikipedia wordnet xml-query-parser
-
-Package: liblucene2-java-doc
-Architecture: all
-Section: doc
-Depends: libregexp-java (>= 1.4), ant-doc
-Description: Documentation for Lucene
- Lucene is a full-text search engine for the Java(TM) programming language.
- Lucene is not a complete application, but rather a code library and API
- that can easily be used to add search capabilities to applications.
- This package contains class API documentation for Lucene.

Copied: tags/lucene2/2.9.1+ds1-1/debian/control (from rev 11025, trunk/lucene2/debian/control)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/control	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/control	2009-11-14 13:06:37 UTC (rev 11065)
@@ -0,0 +1,60 @@
+Source: lucene2
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>, Barry Hawkins <barry at alltc.com>, 
+ Jeff Breidenbach <jab at debian.org>, Michael Koch <konqueror at gmx.de>, Rene Engelhard <rene at debian.org>
+DM-Upload-Allowed: yes
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/lucene2/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/lucene2/
+Homepage: http://lucene.apache.org/java/
+Build-Depends: cdbs (>= 0.4.49), debhelper (>= 6), dpatch (>= 2.0),
+ openjdk-6-jdk, 
+ ant-optional, javacc, junit
+Build-Depends-Indep: libjline-java (>= 0.9.5), 
+ libcommons-digester-java (>= 1.7), 
+ libregexp-java (>= 1.4), 
+ 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-compress-java (>= 1.0),
+ libicu4j-java (>= 3.8.1),
+ libjtidy-java (>= 7+svn20070309)
+Standards-Version: 3.8.3
+
+Package: liblucene2-java
+Architecture: all
+Depends: ${misc:Depends},
+ openjdk-6-jre-headless | java5-runtime-headless,
+Recommends: libcommons-beanutils-java (>= 1.7.0),
+ libcommons-collections3-java (>= 3.1), 
+ libcommons-compress-java (>= 1.0),
+ libcommons-digester-java (>= 1.7), 
+ libcommons-logging-java (>= 1.0.4), 
+ libdb4.7-java,
+ libdb-je-java (>= 3.2.68),
+ libicu4j-java (>= 3.8.1),
+ libjline-java (>= 0.9.5), 
+ libjtidy-java (>= 7+svn20070309),
+ libregexp-java (>= 1.4)
+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.
+ Lucene is not a complete application, but rather a code library and API
+ that can easily be used to add search capabilities to applications.
+ .
+ This package contains the Lucene core library and a number of additional
+ (contributed) libraries.
+
+Package: liblucene2-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: libregexp-java (>= 1.4), ant-doc
+Description: Documentation for Lucene
+ Lucene is a full-text search engine for the Java(TM) programming language.
+ Lucene is not a complete application, but rather a code library and API
+ that can easily be used to add search capabilities to applications.
+ This package contains class API documentation for Lucene.

Deleted: tags/lucene2/2.9.1+ds1-1/debian/copyright
===================================================================
--- trunk/lucene2/debian/copyright	2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.9.1+ds1-1/debian/copyright	2009-11-14 13:06:37 UTC (rev 11065)
@@ -1,21 +0,0 @@
-This package was debianized by Jan-Pascal van Best <janpascal at vanbest.org> on
-Thu, 12 Jul 2007 08:21:19 +0200
-
-It was downloaded from
-http://www.apache.org/dist/lucene/java/lucene-2.2.0-src.tar.gz
-
-The lucene2_2.2.0.orig.tar.gz tarball was created by removing all
-third party jars from the above upstream source. Use the script
-debian/get-orig-source.sh to download the upstream source and 
-create lucene2_2.2.0.orig.tar.gz
-
-Copyright Holders: Doug Cutting <cutting at apache.org>, Erik Hatcher
-<ehatcher at apacher.org>, Otis Gospodnetic <otis at apache.org> et.al.
-
-Lucene is licensed under the Apache License, version 2.0. On Debian 
-systems, the complete text of the Apache License, version 2.0, can
-be found in `/usr/share/common-licenses/Apache-2.0'.
-
-The Debian packaging (the files under debian/) is 
-Copyright 2007,2008 Jan-Pascal van Best <janpascal at vanbest.org>. It is
-also licensed under the terms of the Apache License, version 2.0.

Copied: tags/lucene2/2.9.1+ds1-1/debian/copyright.old (from rev 10988, trunk/lucene2/debian/copyright.old)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/copyright.old	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/copyright.old	2009-11-14 13:06:37 UTC (rev 11065)
@@ -0,0 +1,21 @@
+This package was debianized by Jan-Pascal van Best <janpascal at vanbest.org> on
+Thu, 12 Jul 2007 08:21:19 +0200
+
+It was downloaded from
+http://www.apache.org/dist/lucene/java/lucene-2.2.0-src.tar.gz
+
+The lucene2_2.2.0.orig.tar.gz tarball was created by removing all
+third party jars from the above upstream source. Use the script
+debian/get-orig-source.sh to download the upstream source and 
+create lucene2_2.2.0.orig.tar.gz
+
+Copyright Holders: Doug Cutting <cutting at apache.org>, Erik Hatcher
+<ehatcher at apacher.org>, Otis Gospodnetic <otis at apache.org> et.al.
+
+Lucene is licensed under the Apache License, version 2.0. On Debian 
+systems, the complete text of the Apache License, version 2.0, can
+be found in `/usr/share/common-licenses/Apache-2.0'.
+
+The Debian packaging (the files under debian/) is 
+Copyright 2007,2008,2009 Jan-Pascal van Best <janpascal at vanbest.org>. It is
+also licensed under the terms of the Apache License, version 2.0.

Deleted: tags/lucene2/2.9.1+ds1-1/debian/get-orig-source.sh
===================================================================
--- trunk/lucene2/debian/get-orig-source.sh	2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.9.1+ds1-1/debian/get-orig-source.sh	2009-11-14 13:06:37 UTC (rev 11065)
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-DEHS=`( uscan --dehs )`
-
-URL=`echo $DEHS | xsltproc debian/uscan-url.xslt -`
-VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -`
-DEBIAN_SOURCE_VERSION="$VERSION+ds1"
-
-DESTDIR=$PWD/..
-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"
-KEYFILE="debian/KEYS"
-KEYRING="debian/lucene-keyring.gpg"
-
-# Download source tarball and signature file
-wget "$URL" -O $SOURCEFILE
-wget "$URL.asc" -O $SIGFILE
-
-# If necessary, recreate keyring used for signing
-# Only do this if the keyring is not yet downloaded
-if [ ! -r $KEYFILE ]; then
-    wget "$KEYURL" -O "$KEYFILE"
-fi
-
-if [ ! -r $KEYRING ]; then
-    touch $KEYRING
-    gpg --no-default-keyring --primary-keyring $KEYRING --import $KEYFILE
-fi
-
-# 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"
-
-# Repackage upstream source file without the third party jars
-TEMPDIR=`mktemp -d`
-echo "Unpacking into tempdir $TEMPDIR..."
-tar xzf $SOURCEFILE -C $TEMPDIR
-
-echo "Removing third party jars..."
-find $TEMPDIR -name \*.jar -exec rm {} \;
-
-echo "Removing pre-generated javacc output files..."
-# Some generated files are excepted because they are not properly generated by
-# the build system
-fgrep -lR "Generated By:JavaCC:" $TEMPDIR | grep -v "analysis/standard/ParseException.java\|precedence\|surround" | xargs -n5 rm
-
-echo "Packing new orig source tarball $SOURCETAR..."
-rm -f $SOURCETAR $SOURCETAR.gz
-cd $TEMPDIR
-tar cf $SOURCETAR *
-gzip -9 $SOURCETAR
-cd $DESTDIR
-
-echo "Removing tempdir..."
-rm -rf "$TEMPDIR"
-

Copied: tags/lucene2/2.9.1+ds1-1/debian/get-orig-source.sh (from rev 10782, trunk/lucene2/debian/get-orig-source.sh)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/get-orig-source.sh	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/get-orig-source.sh	2009-11-14 13:06:37 UTC (rev 11065)
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+DEHS=`( uscan --dehs )`
+
+URL=`echo $DEHS | xsltproc debian/uscan-url.xslt -`
+VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -`
+DEBIAN_SOURCE_VERSION="$VERSION+ds1"
+
+DESTDIR=$PWD/..
+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"
+KEYFILE="debian/KEYS"
+KEYRING="debian/lucene-keyring.gpg"
+
+# Download source tarball and signature file
+if [ ! -r "$SOURCEFILE" ]; then
+  wget "$URL" -O $SOURCEFILE
+fi
+
+wget "$URL.asc" -O $SIGFILE
+
+# If necessary, recreate keyring used for signing
+# Only do this if the keyring is not yet downloaded
+if [ ! -r $KEYFILE ]; then
+    wget "$KEYURL" -O "$KEYFILE"
+fi
+
+if [ ! -r $KEYRING ]; then
+    touch $KEYRING
+    gpg --no-default-keyring --primary-keyring $KEYRING --import $KEYFILE
+fi
+
+# Check signature
+gpgv --quiet --keyring $KEYRING $SIGFILE $SOURCEFILE
+
+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`
+echo "Unpacking into tempdir $TEMPDIR..."
+tar xzf $SOURCEFILE -C $TEMPDIR
+
+echo "Removing third party jars..."
+find $TEMPDIR -name \*.jar -exec rm {} \;
+
+echo "Removing pre-generated javacc output files..."
+# Some generated files are excepted because they are not properly generated by
+# the build system
+fgrep -lR "Generated By:JavaCC:" $TEMPDIR | grep -v "analysis/standard/ParseException.java\|precedence\|surround" | xargs -n5 rm
+
+echo "Packing new orig source tarball $SOURCETAR..."
+rm -f $SOURCETAR $SOURCETAR.gz
+cd $TEMPDIR
+tar cf $SOURCETAR *
+gzip -9 $SOURCETAR
+cd $DESTDIR
+
+echo "Removing tempdir..."
+rm -rf "$TEMPDIR"
+

Deleted: tags/lucene2/2.9.1+ds1-1/debian/patches/00list
===================================================================
--- trunk/lucene2/debian/patches/00list	2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/00list	2009-11-14 13:06:37 UTC (rev 11065)
@@ -1,11 +0,0 @@
-01_remove_all_jarfiles.dpatch
-10_fix-javacc-locations.dpatch
-30_fix-contrib-ant-libs.dpatch
-40_fix-contrib-benchmark-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
-81_prevent-network-access.dpatch

Copied: tags/lucene2/2.9.1+ds1-1/debian/patches/00list (from rev 11021, trunk/lucene2/debian/patches/00list)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/patches/00list	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/00list	2009-11-14 13:06:37 UTC (rev 11065)
@@ -0,0 +1,15 @@
+01_remove_all_jarfiles.dpatch
+10_fix-javacc-locations.dpatch
+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
+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
+81_disable-test-tag-backcompat-tests.dpatch

Copied: tags/lucene2/2.9.1+ds1-1/debian/patches/11_fix-javacc-generated-files.dpatch (from rev 10782, trunk/lucene2/debian/patches/11_fix-javacc-generated-files.dpatch)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/patches/11_fix-javacc-generated-files.dpatch	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/11_fix-javacc-generated-files.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -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,&#10;
+   	        int[][] expectedTokenSequencesVal, String[] tokenImageVal) {&#10;
+-  	    super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, initialise(&#10;
+-  	      currentTokenVal, expectedTokenSequencesVal, tokenImageVal)));&#10;
++  	    super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, new Object[]{initialise(&#10;
++  	      currentTokenVal, expectedTokenSequencesVal, tokenImageVal)}));&#10;
+   	    this.currentToken = currentTokenVal;&#10;
+   	    this.expectedTokenSequences = expectedTokenSequencesVal;&#10;
+   	    this.tokenImage = tokenImageVal;&#10;
+@@ -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() {&#10;
+-  	    super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, &quot;Error&quot;));&#10;
++  	    super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, new Object[]{&quot;Error&quot;}));&#10;
+   	  }"
+   	                         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>

Copied: tags/lucene2/2.9.1+ds1-1/debian/patches/20_fix-java-compiler-version.dpatch (from rev 10988, trunk/lucene2/debian/patches/20_fix-java-compiler-version.dpatch)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/patches/20_fix-java-compiler-version.dpatch	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/20_fix-java-compiler-version.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_fix-java-compiler-version.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Source version 1.5 needed because of annotations. The Debian package
+## DP: already depends on java >= 1.5
+
+ at DPATCH@
+diff -urNad lucene2~/common-build.xml lucene2/common-build.xml
+--- lucene2~/common-build.xml	2009-11-03 22:32:24.000000000 +0100
++++ lucene2/common-build.xml	2009-11-03 22:35:55.000000000 +0100
+@@ -58,8 +58,8 @@
+ 
+   <property name="javac.deprecation" value="off"/>
+   <property name="javac.debug" value="on"/>
+-  <property name="javac.source" value="1.4"/>
+-  <property name="javac.target" value="1.4"/>
++  <property name="javac.source" value="1.5"/>
++  <property name="javac.target" value="1.5"/>
+ 
+   <property name="javadoc.link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
+   <property name="javadoc.access" value="protected"/>

Copied: tags/lucene2/2.9.1+ds1-1/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch (from rev 11021, trunk/lucene2/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -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;
+     }

Deleted: tags/lucene2/2.9.1+ds1-1/debian/patches/40_fix-contrib-benchmark-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch	2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/40_fix-contrib-benchmark-libs.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -1,47 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_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/
-
- at 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"/>
-         <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}"/>
-     </path>
-     <path id="run.classpath">
-         <path refid="classpath"/>

Copied: tags/lucene2/2.9.1+ds1-1/debian/patches/40_fix-contrib-benchmark-libs.dpatch (from rev 10988, trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/patches/40_fix-contrib-benchmark-libs.dpatch	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/40_fix-contrib-benchmark-libs.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 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: No description.
+
+ at DPATCH@
+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="${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/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"/>

Copied: tags/lucene2/2.9.1+ds1-1/debian/patches/45_fix-contrib-collation-libs.dpatch (from rev 10142, trunk/lucene2/debian/patches/45_fix-contrib-collation-libs.dpatch)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/patches/45_fix-contrib-collation-libs.dpatch	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/45_fix-contrib-collation-libs.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -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>
+ 

Deleted: tags/lucene2/2.9.1+ds1-1/debian/patches/50_fix-contrib-db-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch	2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/50_fix-contrib-db-libs.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -1,45 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_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/
-
- at 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
-@@ -5,10 +5,8 @@
-     Lucene Berkeley DB integration
-   </description>
- 
--  <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.6-java.jar" />
-   </path>
- 
-   <available classname="com.sleepycat.db.internal.Db" property="db.jar.exists">
-@@ -23,12 +21,6 @@
- 
-   <import file="../../contrib-build.xml" />
- 
--  <target name="get-db-jar" unless="db.jar.exists">
--    <mkdir dir="lib" />
--    <get src="http://downloads.osafoundation.org/db/db-${db.version}.jar"
--         dest="lib/db-${db.version}.jar" />
--  </target>
--
-   <target name="sanity-load-lib" depends="compile-test">
-     <java classname="org.apache.lucene.store.db.SanityLoadLibrary"
-           classpathref="junit.classpath"
-@@ -55,7 +47,6 @@
-     <antcall target="common.test" inheritAll="true" inheritRefs="true" />
-   </target>
- 
--  <target name="check-and-get-db-jar" depends="get-db-jar" />
--  <target name="init" depends="contrib-build.init,check-and-get-db-jar" />
-+  <target name="init" depends="contrib-build.init" />
- 
- </project>

Copied: tags/lucene2/2.9.1+ds1-1/debian/patches/50_fix-contrib-db-libs.dpatch (from rev 10142, trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/patches/50_fix-contrib-db-libs.dpatch	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/50_fix-contrib-db-libs.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 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: No description.
+
+ at DPATCH@
+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.7.25" />
+-
+   <path id="db.jar">
+-    <pathelement location="lib/db-${db.version}.jar" />
++    <pathelement location="/usr/share/java/libdb4.7-java.jar" />
+   </path>
+ 
+   <available classname="com.sleepycat.db.internal.Db" property="db.jar.exists">
+@@ -30,12 +28,6 @@
+     <pathelement location="${build.dir}/classes/java"/>
+   </path>
+ 
+-  <target name="get-db-jar" unless="db.jar.exists">
+-    <mkdir dir="lib" />
+-    <get src="http://downloads.osafoundation.org/db/db-${db.version}.jar"
+-         dest="lib/db-${db.version}.jar" />
+-  </target>
+-
+   <target name="sanity-load-lib" depends="compile-test">
+     <java classname="org.apache.lucene.store.db.SanityLoadLibrary"
+           classpathref="junit.classpath"
+@@ -62,7 +54,6 @@
+     <antcall target="common.test" inheritAll="true" inheritRefs="true" />
+   </target>
+ 
+-  <target name="check-and-get-db-jar" depends="get-db-jar" />
+-  <target name="init" depends="contrib-build.init,check-and-get-db-jar" />
++  <target name="init" depends="contrib-build.init" />
+ 
+ </project>

Deleted: tags/lucene2/2.9.1+ds1-1/debian/patches/55_fix-contrib-db-je-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch	2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/55_fix-contrib-db-je-libs.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -1,42 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 55_fix-contrib-db-jre-compilation.dpatch by  <varun at debian.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/
-
- at 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>
- 
--  <property name="je.version" value="2.0.90" />
--
-   <path id="je.jar">
--    <pathelement location="lib/je-${je.version}/lib/je.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" />
- 
--  <target name="get-je-jar" unless="je.jar.exists">
--    <mkdir dir="lib" />
--    <get src="http://download.oracle.com/berkeley-db/je-${je.version}.zip"
--         dest="lib/je-${je.version}.zip" />
--    <unzip src="lib/je-${je.version}.zip" dest="lib">
--      <patternset>
--        <include name="je-${je.version}/lib/je.jar" />
--      </patternset>
--    </unzip>
--  </target>
--
--  <target name="check-and-get-je-jar" depends="get-je-jar" />
--  <target name="init" depends="contrib-build.init,check-and-get-je-jar" />
-+  <target name="init" depends="contrib-build.init" />
- </project>

Copied: tags/lucene2/2.9.1+ds1-1/debian/patches/55_fix-contrib-db-je-libs.dpatch (from rev 10142, trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/patches/55_fix-contrib-db-je-libs.dpatch	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/55_fix-contrib-db-je-libs.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 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: No description.
+
+ at DPATCH@
+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" />
+ 
+   <path id="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">
+@@ -30,17 +30,5 @@
+     <pathelement location="${build.dir}/classes/java"/>
+   </path>
+ 
+-  <target name="get-je-jar" unless="je.jar.exists">
+-    <mkdir dir="lib" />
+-    <get src="http://download.oracle.com/berkeley-db/je-${je.version}.zip"
+-         dest="lib/je-${je.version}.zip" />
+-    <unzip src="lib/je-${je.version}.zip" dest="lib">
+-      <patternset>
+-        <include name="je-${je.version}/lib/je-${je.version}.jar" />
+-      </patternset>
+-    </unzip>
+-  </target>
+-
+-  <target name="check-and-get-je-jar" depends="get-je-jar" />
+-  <target name="init" depends="contrib-build.init,check-and-get-je-jar" />
++  <target name="init" depends="contrib-build.init" />
+ </project>

Deleted: tags/lucene2/2.9.1+ds1-1/debian/patches/61_lucli-script.dpatch
===================================================================
--- trunk/lucene2/debian/patches/61_lucli-script.dpatch	2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/61_lucli-script.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 61_lucli-script.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the lucli run.sh script to use the jar files in the
-## DP: standard locations.
-
- at DPATCH@
-diff -urNad trunk~/contrib/lucli/run.sh trunk/contrib/lucli/run.sh
---- trunk~/contrib/lucli/run.sh	2007-06-17 07:21:04.000000000 +0200
-+++ trunk/contrib/lucli/run.sh	2007-07-12 07:33:09.000000000 +0200
-@@ -1,6 +1,7 @@
--LUCLI=.
-+#!/bin/sh 
-+
-+LUCLI=/usr/share/java
- LUCLI_MEMORY=128M
--#JAVA_HOME=/home/dror/j2sdk1.4.1_03/
--CLASSPATH=${CLASSPATH}:$LUCLI/lib/jline.jar:$LUCLI/lib/lucene.jar:$LUCLI/dist/lucli-dev.jar
-+CLASSPATH=${CLASSPATH}:$LUCLI/jline.jar:$LUCLI/lucene-core.jar:$LUCLI/lucene-lucli.jar
- export CLASSPATH
--$JAVA_HOME/bin/java -Xmx${LUCLI_MEMORY} lucli.Lucli
-+java -Xmx${LUCLI_MEMORY} lucli.Lucli

Copied: tags/lucene2/2.9.1+ds1-1/debian/patches/61_lucli-script.dpatch (from rev 10988, trunk/lucene2/debian/patches/61_lucli-script.dpatch)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/patches/61_lucli-script.dpatch	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/61_lucli-script.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 61_lucli-script.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix the lucli run.sh script to use the jar files in the
+## DP: standard locations.
+
+ at DPATCH@
+diff -urNad lucene2~/contrib/lucli/run.sh lucene2/contrib/lucli/run.sh
+--- lucene2~/contrib/lucli/run.sh	2009-10-09 13:00:12.000000000 +0200
++++ lucene2/contrib/lucli/run.sh	2009-10-09 13:01:00.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/bin/sh 
+ 
+ #    Licensed to the Apache Software Foundation (ASF) under one or more
+ #    contributor license agreements.  See the NOTICE file distributed with
+@@ -14,9 +15,8 @@
+ #    See the License for the specific language governing permissions and
+ #    limitations under the License.
+ 
+-LUCLI=.
++LUCLI=/usr/share/java
+ LUCLI_MEMORY=128M
+-#JAVA_HOME=/home/dror/j2sdk1.4.1_03/
+-CLASSPATH=${CLASSPATH}:$LUCLI/lib/jline.jar:$LUCLI/lib/lucene.jar:$LUCLI/dist/lucli-dev.jar
++CLASSPATH=${CLASSPATH}:$LUCLI/jline.jar:$LUCLI/lucene-core.jar:$LUCLI/lucene-lucli.jar
+ export CLASSPATH
+-$JAVA_HOME/bin/java -Xmx${LUCLI_MEMORY} lucli.Lucli
++java -Xmx${LUCLI_MEMORY} lucli.Lucli

Copied: tags/lucene2/2.9.1+ds1-1/debian/patches/81_disable-test-tag-backcompat-tests.dpatch (from rev 11021, trunk/lucene2/debian/patches/81_disable-test-tag-backcompat-tests.dpatch)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/patches/81_disable-test-tag-backcompat-tests.dpatch	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/81_disable-test-tag-backcompat-tests.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -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}"/>

Deleted: tags/lucene2/2.9.1+ds1-1/debian/patches/81_prevent-network-access.dpatch
===================================================================
--- trunk/lucene2/debian/patches/81_prevent-network-access.dpatch	2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/81_prevent-network-access.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 81_prevent-network-access.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disable one of the tests in contrib/highlighter. It seems the XML parser
-## DP: resolves the DTD or xmlns address, causing network access which can cause
-## DP: trouble when running automated builds.
-
- at DPATCH@
-diff -urNad lucene2~/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java lucene2/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
---- lucene2~/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java	2008-09-18 19:03:28.000000000 +0200
-+++ lucene2/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java	2008-09-23 17:31:55.000000000 +0200
-@@ -975,6 +975,8 @@
-    * 
-    * @throws Exception
-    */
-+
-+  /* Disabled for Debian packaging, causes network access during builds
-   public void testEncoding() throws Exception {
- 
-     String rawDocContent = "\"Smith & sons' prices < 3 and >4\" claims article";
-@@ -1014,6 +1016,7 @@
-     String decodedSnippet = h2.getFirstChild().getNodeValue();
-     assertEquals("XHTML Encoding should have worked:", rawDocContent, decodedSnippet);
-   }
-+  */
- 
-   public void testMultiSearcher() throws Exception {
-     // setup index 1

Copied: tags/lucene2/2.9.1+ds1-1/debian/patches/old/11_run-javacc-for-contrib-queryparser.dpatch (from rev 11021, trunk/lucene2/debian/patches/old/11_run-javacc-for-contrib-queryparser.dpatch)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/patches/old/11_run-javacc-for-contrib-queryparser.dpatch	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/patches/old/11_run-javacc-for-contrib-queryparser.dpatch	2009-11-14 13:06:37 UTC (rev 11065)
@@ -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;&#10;
++&#10;
++import org.apache.lucene.messages.Message;&#10;
++import org.apache.lucene.messages.MessageImpl;&#10;
++import org.apache.lucene.queryParser.core.*;&#10;
++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,&#10;
++        int[][] expectedTokenSequencesVal, String[] tokenImageVal) {&#10;
++    super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, initialise(&#10;
++      currentTokenVal, expectedTokenSequencesVal, tokenImageVal)));&#10;
++    this.currentToken = currentTokenVal;&#10;
++    this.expectedTokenSequences = expectedTokenSequencesVal;&#10;
++    this.tokenImage = tokenImageVal;&#10;
++  }"
++                         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) {&#10;
++    super(message);&#10;                      
++  }"
++                         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() {&#10;
++    super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, &quot;Error&quot;));&#10;
++  }"
++                         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, &#10;
++      int[][] expectedTokenSequences, String[] tokenImage) {&#10;
++    String eol = System.getProperty(&quot;line.separator&quot;, &quot;\n&quot;);"
++                         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>

Deleted: tags/lucene2/2.9.1+ds1-1/debian/rules
===================================================================
--- trunk/lucene2/debian/rules	2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.9.1+ds1-1/debian/rules	2009-11-14 13:06:37 UTC (rev 11065)
@@ -1,105 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DEB_INSTALL_CHANGELOGS_liblucene2-java := CHANGES.txt
-
-# Build with OpenJDK
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
-
-DEB_ANT_BUILD_TARGET := javacc jar-core build-contrib war-demo javadocs
-DEB_ANT_CHECK_TARGET := test
-DEB_ANT_CLEAN_TARGET := clean
-
-# 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_BASENAME := lucene-$(UPSTREAM_VERSION)
-CHANGESFILE = ../lucene2_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
-
-clean::
-	# 'ant test' in contrib/db leaves some stuff behind...
-	rm -rf $(CURDIR)/contrib/db/bdb/index
-	# Same for 'ant test' in contrib/benchmark
-	rm -rf $(CURDIR)/contrib/benchmark/temp
-	rm -rf $(CURDIR)/contrib/benchmark/work/index
-	rm -rf $(CURDIR)/contrib/benchmark/work/reuters
-	rm -rf $(CURDIR)/contrib/benchmark/work/reuters-out
-	# remove keyring, since it is a binary file
-	rm -f debian/lucene-keyring.gpg
-	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
-
-install/liblucene2-java::
-	# Install the libraries into the liblucene2-java package
-	
-	# Install the core library
-	install -m 0644 build/lucene-core-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java
-	ln -s lucene-core-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java/lucene-core.jar
-	
-	# Install contrib libraries
-	CONTRIB_JARS=`find build/contrib/ -name \*-$(UPSTREAM_VERSION).jar` ; \
-	for jarfile in $$CONTRIB_JARS; do \
-	    install -m 0644 "$$jarfile" $(CURDIR)/debian/liblucene2-java/usr/share/java ; \
-	    CONTRIB=`echo $$jarfile | sed "s/.*\\/lucene-\\([-a-z]*\\)-.*\\.jar/\\1/"` ; \
-	    ln -s lucene-$$CONTRIB-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java/lucene-$$CONTRIB.jar ; \
-	done
-	install -d $(CURDIR)/debian/liblucene2-java/usr/bin/
-	install contrib/lucli/run.sh $(CURDIR)/debian/liblucene2-java/usr/bin/lucli
-	
-	# Install javascript example files as docfiles
-	install -d $(CURDIR)/debian/liblucene2-java/usr/share/doc/liblucene2-java
-	cp -a contrib/javascript $(CURDIR)/debian/liblucene2-java/usr/share/doc/liblucene2-java/
-
-install/liblucene2-java-doc::
-	# Install the documentation into the liblucene2-java-doc package
-	
-	mkdir -p  $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/
-	cp -r docs $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/
-	cp -r build/docs/* $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/docs/
-	# Remove empty directories
-	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/docs/skin/css
-	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/docs/skin/scripts
-	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/docs/skin/translations
-	install -d $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo
-	install -m 644 build/lucene-demos-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo/
-	install -m 644 build/luceneweb.war $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo/
-
-remove-source:
-	rm -f build.xml
-	rm -f common-build.xml
-	rm -f *.txt
-	rm -f *stamp
-	rm -rf debian/patched
-	rm -rf build dist docs example lib src contrib
-
-restore-from-source: remove-source
-	tar xzf ../lucene2_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-	mv $(UPSTREAM_BASENAME)/* .
-	rmdir $(UPSTREAM_BASENAME)
-
-get-orig-source:
-	debian/get-orig-source.sh
-
-check:
-	lintian -i $(CHANGESFILE)
-	linda -i $(CHANGESFILE)
-	zgrep "^---" ../lucene2_$(DEB_VERSION).diff.gz | grep -v debian ; [ $$? != 0 ]
-	( for p in $(DEB_ALL_PACKAGES); do \
-	      dpkg --contents ../$${p}_$(DEB_VERSION)_all.deb ; \
-	  done ) | less
-
-upload:
-	dupload -t mentors $(CHANGESFILE)
-
-.PHONY: patched build clean binary-indep binary-arch binary install install-indep install-arch configure

Copied: tags/lucene2/2.9.1+ds1-1/debian/rules (from rev 10782, trunk/lucene2/debian/rules)
===================================================================
--- tags/lucene2/2.9.1+ds1-1/debian/rules	                        (rev 0)
+++ tags/lucene2/2.9.1+ds1-1/debian/rules	2009-11-14 13:06:37 UTC (rev 11065)
@@ -0,0 +1,104 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DEB_INSTALL_CHANGELOGS_liblucene2-java := CHANGES.txt
+
+# Build with OpenJDK
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+
+DEB_ANT_BUILD_TARGET := javacc jar-core build-contrib war-demo javadocs
+DEB_ANT_CHECK_TARGET := test
+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 "^[^+]*" | sed -e "s/~/-/" )
+UPSTREAM_BASENAME := lucene-$(UPSTREAM_VERSION)
+CHANGESFILE = ../lucene2_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
+
+clean::
+	# 'ant test' in contrib/db leaves some stuff behind...
+	rm -rf $(CURDIR)/contrib/db/bdb/index
+	# Same for 'ant test' in contrib/benchmark
+	rm -rf $(CURDIR)/contrib/benchmark/temp/*
+	rm -rf $(CURDIR)/contrib/benchmark/work/index
+	rm -rf $(CURDIR)/contrib/benchmark/work/reuters
+	rm -rf $(CURDIR)/contrib/benchmark/work/reuters-out
+	# Tags for backward compatibility testing
+	rm -rf $(CURDIR)/tags
+	# remove keyring, since it is a binary file
+	rm -f debian/lucene-keyring.gpg
+	rm -f debian/KEYS
+	# remove all javacc-generated files from src and contrib, except those
+	# that are not regenerated properly 
+	# 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
+	
+	# Install the core library
+	install -m 0644 build/lucene-core-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java
+	ln -s lucene-core-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java/lucene-core.jar
+	
+	# Install contrib libraries
+	CONTRIB_JARS=`find build/contrib/ -name \*-$(UPSTREAM_VERSION).jar` ; \
+	for jarfile in $$CONTRIB_JARS; do \
+	    install -m 0644 "$$jarfile" $(CURDIR)/debian/liblucene2-java/usr/share/java ; \
+	    CONTRIB=`echo $$jarfile | sed "s/.*\\/lucene-\\([-a-z]*\\)-.*\\.jar/\\1/"` ; \
+	    ln -s lucene-$$CONTRIB-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java/lucene-$$CONTRIB.jar ; \
+	done
+	install -d $(CURDIR)/debian/liblucene2-java/usr/bin/
+	install contrib/lucli/run.sh $(CURDIR)/debian/liblucene2-java/usr/bin/lucli
+
+install/liblucene2-java-doc::
+	# Install the documentation into the liblucene2-java-doc package
+	
+	mkdir -p  $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/
+	cp -r docs $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/
+	cp -r build/docs/* $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/docs/
+	# Remove empty directories
+	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/docs/skin/css
+	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/docs/skin/scripts
+	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/docs/skin/translations
+	install -d $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo
+	install -m 644 build/lucene-demos-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo/
+	install -m 644 build/luceneweb.war $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo/
+
+remove-source:
+	rm -f build.xml
+	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
+
+restore-from-source: remove-source
+	tar xzf ../lucene2_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+	mv $(UPSTREAM_BASENAME)/* .
+	rmdir $(UPSTREAM_BASENAME)
+
+get-orig-source:
+	debian/get-orig-source.sh
+
+check:
+	lintian -i $(CHANGESFILE)
+	zgrep "^---" ../lucene2_$(DEB_VERSION).diff.gz | grep -v debian ; [ $$? != 0 ]
+	( for p in $(DEB_ALL_PACKAGES); do \
+	      dpkg --contents ../$${p}_$(DEB_VERSION)_all.deb ; \
+	  done ) | less
+
+upload:
+	dupload -t mentors $(CHANGESFILE)
+
+.PHONY: patched build clean binary-indep binary-arch binary install install-indep install-arch configure




More information about the pkg-java-commits mailing list