[pkg-java] r8086 - in tags/lucene2: . 2.4.0+ds1-5 2.4.0+ds1-5/debian 2.4.0+ds1-5/debian/patches
janpascal-guest at alioth.debian.org
janpascal-guest at alioth.debian.org
Tue Mar 17 15:02:33 UTC 2009
Author: janpascal-guest
Date: 2009-03-17 15:02:33 +0000 (Tue, 17 Mar 2009)
New Revision: 8086
Added:
tags/lucene2/2.4.0+ds1-5/
tags/lucene2/2.4.0+ds1-5/debian/changelog
tags/lucene2/2.4.0+ds1-5/debian/control
tags/lucene2/2.4.0+ds1-5/debian/patches/00list
tags/lucene2/2.4.0+ds1-5/debian/patches/90_fix-invalid-tests.dpatch
Removed:
tags/lucene2/2.4.0+ds1-5/debian/changelog
tags/lucene2/2.4.0+ds1-5/debian/control
tags/lucene2/2.4.0+ds1-5/debian/patches/00list
tags/lucene2/2.4.0+ds1-5/debian/patches/81_prevent-network-access.dpatch
Log:
Tagged lucene2 release 2.4.0+ds1-5
Copied: tags/lucene2/2.4.0+ds1-5 (from rev 7420, trunk/lucene2)
Property changes on: tags/lucene2/2.4.0+ds1-5
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: tags/lucene2/2.4.0+ds1-5/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog 2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.4.0+ds1-5/debian/changelog 2009-03-17 15:02:33 UTC (rev 8086)
@@ -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.4.0+ds1-5/debian/changelog (from rev 8085, trunk/lucene2/debian/changelog)
===================================================================
--- tags/lucene2/2.4.0+ds1-5/debian/changelog (rev 0)
+++ tags/lucene2/2.4.0+ds1-5/debian/changelog 2009-03-17 15:02:33 UTC (rev 8086)
@@ -0,0 +1,118 @@
+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.4.0+ds1-5/debian/control
===================================================================
--- trunk/lucene2/debian/control 2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.4.0+ds1-5/debian/control 2009-03-17 15:02:33 UTC (rev 8086)
@@ -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.4.0+ds1-5/debian/control (from rev 8085, trunk/lucene2/debian/control)
===================================================================
--- tags/lucene2/2.4.0+ds1-5/debian/control (rev 0)
+++ tags/lucene2/2.4.0+ds1-5/debian/control 2009-03-17 15:02:33 UTC (rev 8086)
@@ -0,0 +1,56 @@
+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: ${misc: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)
+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},
+ 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.4.0+ds1-5/debian/patches/00list
===================================================================
--- trunk/lucene2/debian/patches/00list 2008-11-24 00:49:25 UTC (rev 7420)
+++ tags/lucene2/2.4.0+ds1-5/debian/patches/00list 2009-03-17 15:02:33 UTC (rev 8086)
@@ -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.4.0+ds1-5/debian/patches/00list (from rev 8013, trunk/lucene2/debian/patches/00list)
===================================================================
--- tags/lucene2/2.4.0+ds1-5/debian/patches/00list (rev 0)
+++ tags/lucene2/2.4.0+ds1-5/debian/patches/00list 2009-03-17 15:02:33 UTC (rev 8086)
@@ -0,0 +1,11 @@
+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
+90_fix-invalid-tests.dpatch
Deleted: tags/lucene2/2.4.0+ds1-5/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.4.0+ds1-5/debian/patches/81_prevent-network-access.dpatch 2009-03-17 15:02:33 UTC (rev 8086)
@@ -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.4.0+ds1-5/debian/patches/90_fix-invalid-tests.dpatch (from rev 8013, trunk/lucene2/debian/patches/90_fix-invalid-tests.dpatch)
===================================================================
--- tags/lucene2/2.4.0+ds1-5/debian/patches/90_fix-invalid-tests.dpatch (rev 0)
+++ tags/lucene2/2.4.0+ds1-5/debian/patches/90_fix-invalid-tests.dpatch 2009-03-17 15:02:33 UTC (rev 8086)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_fix-invalid-tests.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream also has this patch (revision 731727), with the comment
+## DP: "remove 2 invalid tests of modified utf8 null byte". See
+## DP: also the discussion at
+## DP: http://mail-archives.apache.org/mod_mbox/lucene-java-dev/200901.mbox/%3CEF6C8235-660E-4EC9-A1E6-A7270916BABF@mikemccandless.com%3E
+
+ at DPATCH@
+diff -urNad lucene2~/src/test/org/apache/lucene/index/TestIndexInput.java lucene2/src/test/org/apache/lucene/index/TestIndexInput.java
+--- lucene2~/src/test/org/apache/lucene/index/TestIndexInput.java 2008-10-01 13:58:22.000000000 +0200
++++ lucene2/src/test/org/apache/lucene/index/TestIndexInput.java 2009-02-26 20:54:41.000000000 +0100
+@@ -59,12 +59,6 @@
+ 0x01, 0x00,
+ 0x08, 'L', 'u', 0x00, 'c', 'e', 0x00, 'n', 'e',
+
+- // Modified UTF-8 null bytes
+- 0x02, (byte) 0xC0, (byte) 0x80,
+- 0x0A, 'L', 'u', (byte) 0xC0, (byte) 0x80,
+- 'c', 'e', (byte) 0xC0, (byte) 0x80,
+- 'n', 'e',
+-
+ });
+
+ assertEquals(128,is.readVInt());
+@@ -85,9 +79,6 @@
+
+ assertEquals("\u0000",is.readString());
+ assertEquals("Lu\u0000ce\u0000ne",is.readString());
+-
+- assertEquals("\u0000",is.readString());
+- assertEquals("Lu\u0000ce\u0000ne",is.readString());
+ }
+
+ /**
More information about the pkg-java-commits
mailing list