This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository lucene2.
commit e01c184432a061b0c395ba909da71be38c6f09a8 Author: Jan-Pascal van Best <[email protected]> Date: Tue Sep 23 18:12:46 2008 +0000 Updates for Lucene 2.4.0-rc1 --- debian/ant.properties | 2 +- debian/changelog | 5 ++-- .../patches/40_fix-contrib-benchmark-libs.dpatch | 15 +++++----- debian/patches/81_prevent-network-access.dpatch | 34 +++++++++++----------- 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties index 8d0a03e..492507e 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -2,7 +2,7 @@ # Version number for upstream source; errors in the # upstream source require that it be overridden. -version=2.3.2 +version=2.4.0-rc1 # javacc settings used by Lucene build javacc.home=/usr/share/java diff --git a/debian/changelog b/debian/changelog index b2abfeb..7c15971 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -lucene2 (2.3.2+ds1-2) UNRELEASED; urgency=low +lucene2 (2.4.0-rc1+ds1-1) UNRELEASED; urgency=low + * New upstream version (2 patches patched) * Add DM-Upload-Allowed: Yes to debian/control - -- Jan-Pascal van Best <[email protected]> Mon, 08 Sep 2008 10:26:32 +0200 + -- Jan-Pascal van Best <[email protected]> Tue, 23 Sep 2008 19:25:33 +0200 lucene2 (2.3.2+ds1-1) unstable; urgency=low diff --git a/debian/patches/40_fix-contrib-benchmark-libs.dpatch b/debian/patches/40_fix-contrib-benchmark-libs.dpatch index 534a125..97ed45f 100755 --- a/debian/patches/40_fix-contrib-benchmark-libs.dpatch +++ b/debian/patches/40_fix-contrib-benchmark-libs.dpatch @@ -9,7 +9,7 @@ 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 -@@ -99,22 +99,22 @@ +@@ -100,23 +100,23 @@ <antcall target="expand-reuters"/> <antcall target="extract-reuters"/> </target> @@ -29,12 +29,13 @@ diff -urNad lucene2-2.3.0~/contrib/benchmark/build.xml lucene2-2.3.0/contrib/ben <path id="classpath"> <pathelement path="${common.dir}/build/classes/java"/> <pathelement path="${common.dir}/build/classes/demo"/> -- <pathelement path="${basedir}/lib/${digester.jar}"/> -- <pathelement path="${basedir}/lib/${collections.jar}"/> -- <pathelement path="${basedir}/lib/${logging.jar}"/> -- <pathelement path="${basedir}/lib/${bean-utils.jar}"/> -- <pathelement path="${basedir}/lib/${xercesImpl.jar}"/> -- <pathelement path="${basedir}/lib/${xml-apis.jar}"/> + <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}"/> diff --git a/debian/patches/81_prevent-network-access.dpatch b/debian/patches/81_prevent-network-access.dpatch index 8b231b7..7203de1 100755 --- a/debian/patches/81_prevent-network-access.dpatch +++ b/debian/patches/81_prevent-network-access.dpatch @@ -8,22 +8,22 @@ @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-01-21 02:29:36.000000000 +0100 -+++ lucene2/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java 2008-02-01 14:15:45.000000000 +0100 -@@ -449,6 +449,8 @@ - * Demonstrates creation of an XHTML compliant doc using new encoding facilities. - * @throws Exception - */ +--- 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"; -@@ -499,6 +501,7 @@ - String decodedSnippet=h2.getFirstChild().getNodeValue(); - assertEquals("XHTML Encoding should have worked:", rawDocContent,decodedSnippet); - } -+ */ ++ /* Disabled for Debian packaging, causes network access during builds + public void testEncoding() throws Exception { - public void testMultiSearcher() 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
