Author: janpascal-guest Date: 2009-11-04 14:21:03 +0000 (Wed, 04 Nov 2009) New Revision: 10988
Added: trunk/lucene2/debian/copyright.old trunk/lucene2/debian/patches/20_fix-java-compiler-version.dpatch Removed: trunk/lucene2/debian/copyright Modified: trunk/lucene2/debian/changelog trunk/lucene2/debian/control trunk/lucene2/debian/patches/00list trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch trunk/lucene2/debian/patches/61_lucli-script.dpatch Log: 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 Modified: trunk/lucene2/debian/changelog =================================================================== --- trunk/lucene2/debian/changelog 2009-11-04 07:50:38 UTC (rev 10987) +++ trunk/lucene2/debian/changelog 2009-11-04 14:21:03 UTC (rev 10988) @@ -1,3 +1,13 @@ +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 @@ -2,5 +12,5 @@ * 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 Modified: trunk/lucene2/debian/control =================================================================== --- trunk/lucene2/debian/control 2009-11-04 07:50:38 UTC (rev 10987) +++ trunk/lucene2/debian/control 2009-11-04 14:21:03 UTC (rev 10988) @@ -20,8 +20,10 @@ 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 @@ 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. Deleted: trunk/lucene2/debian/copyright =================================================================== --- trunk/lucene2/debian/copyright 2009-11-04 07:50:38 UTC (rev 10987) +++ trunk/lucene2/debian/copyright 2009-11-04 14:21:03 UTC (rev 10988) @@ -1,21 +0,0 @@ -This package was debianized by Jan-Pascal van Best <[email protected]> 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 <[email protected]>, Erik Hatcher -<[email protected]>, Otis Gospodnetic <[email protected]> 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 <[email protected]>. It is -also licensed under the terms of the Apache License, version 2.0. Copied: trunk/lucene2/debian/copyright.old (from rev 7420, trunk/lucene2/debian/copyright) =================================================================== --- trunk/lucene2/debian/copyright.old (rev 0) +++ trunk/lucene2/debian/copyright.old 2009-11-04 14:21:03 UTC (rev 10988) @@ -0,0 +1,21 @@ +This package was debianized by Jan-Pascal van Best <[email protected]> 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 <[email protected]>, Erik Hatcher +<[email protected]>, Otis Gospodnetic <[email protected]> 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 <[email protected]>. It is +also licensed under the terms of the Apache License, version 2.0. Modified: trunk/lucene2/debian/patches/00list =================================================================== --- trunk/lucene2/debian/patches/00list 2009-11-04 07:50:38 UTC (rev 10987) +++ trunk/lucene2/debian/patches/00list 2009-11-04 14:21:03 UTC (rev 10988) @@ -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 Added: trunk/lucene2/debian/patches/20_fix-java-compiler-version.dpatch =================================================================== --- trunk/lucene2/debian/patches/20_fix-java-compiler-version.dpatch (rev 0) +++ trunk/lucene2/debian/patches/20_fix-java-compiler-version.dpatch 2009-11-04 14:21:03 UTC (rev 10988) @@ -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"/> Property changes on: trunk/lucene2/debian/patches/20_fix-java-compiler-version.dpatch ___________________________________________________________________ Added: svn:executable + * Modified: trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch =================================================================== --- trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch 2009-11-04 07:50:38 UTC (rev 10987) +++ trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch 2009-11-04 14:21:03 UTC (rev 10988) @@ -17,7 +17,7 @@ - </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"/> Modified: trunk/lucene2/debian/patches/61_lucli-script.dpatch =================================================================== --- trunk/lucene2/debian/patches/61_lucli-script.dpatch 2009-11-04 07:50:38 UTC (rev 10987) +++ trunk/lucene2/debian/patches/61_lucli-script.dpatch 2009-11-04 14:21:03 UTC (rev 10988) @@ -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 @@ +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=. -+#!/bin/sh -+ +LUCLI=/usr/share/java LUCLI_MEMORY=128M -#JAVA_HOME=/home/dror/j2sdk1.4.1_03/ _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
