This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository lucene2.
commit 8e275966f9abe367101cfb25777aaa458f4b4220 Author: Jan-Pascal van Best <[email protected]> Date: Wed Nov 4 14:21:03 2009 +0000 Updated Java source and target version to 1.5; 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 --- debian/changelog | 14 ++++++++++++-- debian/control | 10 +++++++--- debian/{copyright => copyright.old} | 2 +- debian/patches/00list | 1 + debian/patches/20_fix-java-compiler-version.dpatch | 22 ++++++++++++++++++++++ .../patches/40_fix-contrib-benchmark-libs.dpatch | 2 +- debian/patches/61_lucli-script.dpatch | 18 ++++++++++++------ 7 files changed, 56 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index cba463f..feb5969 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,20 @@ +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 <[email protected]> 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.2 (no changes needed) + * Bumped standards version to 3.8.3 (no changes needed) - -- Jan-Pascal van Best <[email protected]> Sat, 26 Sep 2009 21:24:03 +0200 + -- Jan-Pascal van Best <[email protected]> Fri, 09 Oct 2009 16:02:03 +0200 lucene2 (2.4.1+ds1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 20de6fe..c111906 100644 --- a/debian/control +++ b/debian/control @@ -20,8 +20,10 @@ Build-Depends-Indep: libjtidy-java (>= 7), libcommons-collections3-java (>= 3.1), libcommons-logging-java (>= 1.0.4), libcommons-beanutils-java (>= 1.7.0), - libcommons-compress-java -Standards-Version: 3.8.2 + libcommons-compress-java (>= 1.0), + libicu4j-java (>= 3.8.1), + libjtidy-java (>= 7+svn20070309) +Standards-Version: 3.8.3 Package: liblucene2-java Architecture: all @@ -36,7 +38,9 @@ Depends: ${misc:Depends}, libcommons-collections3-java (>= 3.1), libcommons-logging-java (>= 1.0.4), libcommons-beanutils-java (>= 1.7.0), - libcommons-compress-java + libcommons-compress-java (>= 1.0), + libicu4j-java (>= 3.8.1), + libjtidy-java (>= 7+svn20070309) 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. diff --git a/debian/copyright b/debian/copyright.old similarity index 91% rename from debian/copyright rename to debian/copyright.old index 75ad790..e9bfb60 100644 --- a/debian/copyright +++ b/debian/copyright.old @@ -17,5 +17,5 @@ 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 <[email protected]>. It is +Copyright 2007,2008,2009 Jan-Pascal van Best <[email protected]>. It is also licensed under the terms of the Apache License, version 2.0. diff --git a/debian/patches/00list b/debian/patches/00list index 035620e..07e6aa1 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,6 +1,7 @@ 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 40_fix-contrib-benchmark-libs.dpatch 45_fix-contrib-collation-libs.dpatch diff --git a/debian/patches/20_fix-java-compiler-version.dpatch b/debian/patches/20_fix-java-compiler-version.dpatch new file mode 100755 index 0000000..2eb0cc2 --- /dev/null +++ b/debian/patches/20_fix-java-compiler-version.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_fix-java-compiler-version.dpatch by Jan-Pascal van Best <[email protected]> +## +## 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 + +@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"/> diff --git a/debian/patches/40_fix-contrib-benchmark-libs.dpatch b/debian/patches/40_fix-contrib-benchmark-libs.dpatch index f6bf359..f1f4d52 100755 --- a/debian/patches/40_fix-contrib-benchmark-libs.dpatch +++ b/debian/patches/40_fix-contrib-benchmark-libs.dpatch @@ -17,7 +17,7 @@ diff -urNad lucene2~/contrib/benchmark/build.xml lucene2/contrib/benchmark/build - </fileset> + <pathelement path="/usr/share/java/commons-digester.jar"/> + <pathelement path="/usr/share/java/commons-collections.jar"/> -+ <pathelement path="/usr/local/share/java/commons-compress.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"/> diff --git a/debian/patches/61_lucli-script.dpatch b/debian/patches/61_lucli-script.dpatch index 6aa4a65..c1cdabd 100755 --- a/debian/patches/61_lucli-script.dpatch +++ b/debian/patches/61_lucli-script.dpatch @@ -6,13 +6,19 @@ ## DP: standard locations. @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=. +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/ -- 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
