[pkg-java] r7149 - in tags/lucene2: . 2.4.0+ds1-1 2.4.0+ds1-1/debian 2.4.0+ds1-1/debian/patches
janpascal-guest at alioth.debian.org
janpascal-guest at alioth.debian.org
Wed Oct 15 09:41:59 UTC 2008
Author: janpascal-guest
Date: 2008-10-15 09:41:59 +0000 (Wed, 15 Oct 2008)
New Revision: 7149
Added:
tags/lucene2/2.4.0+ds1-1/
tags/lucene2/2.4.0+ds1-1/debian/ant.properties
tags/lucene2/2.4.0+ds1-1/debian/changelog
tags/lucene2/2.4.0+ds1-1/debian/control
tags/lucene2/2.4.0+ds1-1/debian/get-orig-source.sh
tags/lucene2/2.4.0+ds1-1/debian/patches/40_fix-contrib-benchmark-libs.dpatch
tags/lucene2/2.4.0+ds1-1/debian/patches/81_prevent-network-access.dpatch
tags/lucene2/2.4.0+ds1-1/debian/rules
Removed:
tags/lucene2/2.4.0+ds1-1/debian/ant.properties
tags/lucene2/2.4.0+ds1-1/debian/changelog
tags/lucene2/2.4.0+ds1-1/debian/control
tags/lucene2/2.4.0+ds1-1/debian/get-orig-source.sh
tags/lucene2/2.4.0+ds1-1/debian/patches/40_fix-contrib-benchmark-libs.dpatch
tags/lucene2/2.4.0+ds1-1/debian/patches/81_prevent-network-access.dpatch
tags/lucene2/2.4.0+ds1-1/debian/rules
Log:
Tagging lucene2 release 2.4.0+ds1-1
Copied: tags/lucene2/2.4.0+ds1-1 (from rev 6946, trunk/lucene2)
Property changes on: tags/lucene2/2.4.0+ds1-1
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: tags/lucene2/2.4.0+ds1-1/debian/ant.properties
===================================================================
--- trunk/lucene2/debian/ant.properties 2008-08-26 21:00:31 UTC (rev 6946)
+++ tags/lucene2/2.4.0+ds1-1/debian/ant.properties 2008-10-15 09:41:59 UTC (rev 7149)
@@ -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.3.2
-
-# 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.4.0+ds1-1/debian/ant.properties (from rev 7131, trunk/lucene2/debian/ant.properties)
===================================================================
--- tags/lucene2/2.4.0+ds1-1/debian/ant.properties (rev 0)
+++ tags/lucene2/2.4.0+ds1-1/debian/ant.properties 2008-10-15 09:41:59 UTC (rev 7149)
@@ -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.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
Deleted: tags/lucene2/2.4.0+ds1-1/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog 2008-08-26 21:00:31 UTC (rev 6946)
+++ tags/lucene2/2.4.0+ds1-1/debian/changelog 2008-10-15 09:41:59 UTC (rev 7149)
@@ -1,78 +0,0 @@
-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-1/debian/changelog (from rev 7131, trunk/lucene2/debian/changelog)
===================================================================
--- tags/lucene2/2.4.0+ds1-1/debian/changelog (rev 0)
+++ tags/lucene2/2.4.0+ds1-1/debian/changelog 2008-10-15 09:41:59 UTC (rev 7149)
@@ -0,0 +1,85 @@
+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-1/debian/control
===================================================================
--- trunk/lucene2/debian/control 2008-08-26 21:00:31 UTC (rev 6946)
+++ tags/lucene2/2.4.0+ds1-1/debian/control 2008-10-15 09:41:59 UTC (rev 7149)
@@ -1,54 +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>
-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.5-java (>= 4.5.20),
- 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.5-java (>= 4.5.20),
- 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-1/debian/control (from rev 6978, trunk/lucene2/debian/control)
===================================================================
--- tags/lucene2/2.4.0+ds1-1/debian/control (rev 0)
+++ tags/lucene2/2.4.0+ds1-1/debian/control 2008-10-15 09:41:59 UTC (rev 7149)
@@ -0,0 +1,55 @@
+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>
+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.5-java (>= 4.5.20),
+ 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.5-java (>= 4.5.20),
+ 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.
Deleted: tags/lucene2/2.4.0+ds1-1/debian/get-orig-source.sh
===================================================================
--- trunk/lucene2/debian/get-orig-source.sh 2008-08-26 21:00:31 UTC (rev 6946)
+++ tags/lucene2/2.4.0+ds1-1/debian/get-orig-source.sh 2008-10-15 09:41:59 UTC (rev 7149)
@@ -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 Busch (Lucene Committer) <buschmi at apache.org>, key ID 6BD872A0"
-
-# 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.4.0+ds1-1/debian/get-orig-source.sh (from rev 7131, trunk/lucene2/debian/get-orig-source.sh)
===================================================================
--- tags/lucene2/2.4.0+ds1-1/debian/get-orig-source.sh (rev 0)
+++ tags/lucene2/2.4.0+ds1-1/debian/get-orig-source.sh 2008-10-15 09:41:59 UTC (rev 7149)
@@ -0,0 +1,60 @@
+#!/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"
+
Deleted: tags/lucene2/2.4.0+ds1-1/debian/patches/40_fix-contrib-benchmark-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch 2008-08-26 21:00:31 UTC (rev 6946)
+++ tags/lucene2/2.4.0+ds1-1/debian/patches/40_fix-contrib-benchmark-libs.dpatch 2008-10-15 09:41:59 UTC (rev 7149)
@@ -1,46 +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
-@@ -99,22 +99,22 @@
- <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="${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="/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.4.0+ds1-1/debian/patches/40_fix-contrib-benchmark-libs.dpatch (from rev 7037, trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch)
===================================================================
--- tags/lucene2/2.4.0+ds1-1/debian/patches/40_fix-contrib-benchmark-libs.dpatch (rev 0)
+++ tags/lucene2/2.4.0+ds1-1/debian/patches/40_fix-contrib-benchmark-libs.dpatch 2008-10-15 09:41:59 UTC (rev 7149)
@@ -0,0 +1,47 @@
+#! /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"/>
Deleted: tags/lucene2/2.4.0+ds1-1/debian/patches/81_prevent-network-access.dpatch
===================================================================
--- trunk/lucene2/debian/patches/81_prevent-network-access.dpatch 2008-08-26 21:00:31 UTC (rev 6946)
+++ tags/lucene2/2.4.0+ds1-1/debian/patches/81_prevent-network-access.dpatch 2008-10-15 09:41:59 UTC (rev 7149)
@@ -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-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
- */
-+
-+ /* 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);
- }
-+ */
-
- public void testMultiSearcher() throws Exception
- {
Copied: tags/lucene2/2.4.0+ds1-1/debian/patches/81_prevent-network-access.dpatch (from rev 7037, trunk/lucene2/debian/patches/81_prevent-network-access.dpatch)
===================================================================
--- tags/lucene2/2.4.0+ds1-1/debian/patches/81_prevent-network-access.dpatch (rev 0)
+++ tags/lucene2/2.4.0+ds1-1/debian/patches/81_prevent-network-access.dpatch 2008-10-15 09:41:59 UTC (rev 7149)
@@ -0,0 +1,29 @@
+#! /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
Deleted: tags/lucene2/2.4.0+ds1-1/debian/rules
===================================================================
--- trunk/lucene2/debian/rules 2008-08-26 21:00:31 UTC (rev 6946)
+++ tags/lucene2/2.4.0+ds1-1/debian/rules 2008-10-15 09:41:59 UTC (rev 7149)
@@ -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-\\(.*\\)-.*\\.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.4.0+ds1-1/debian/rules (from rev 7131, trunk/lucene2/debian/rules)
===================================================================
--- tags/lucene2/2.4.0+ds1-1/debian/rules (rev 0)
+++ tags/lucene2/2.4.0+ds1-1/debian/rules 2008-10-15 09:41:59 UTC (rev 7149)
@@ -0,0 +1,105 @@
+#!/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
More information about the pkg-java-commits
mailing list