This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository lucene2.
commit 215d664fed8de937fea94d011112c783ad1a629a Author: Jan-Pascal van Best <[email protected]> Date: Thu Jan 31 15:50:33 2008 +0000 * 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 * some small fixes resulting from new upstream version --- debian/ant.properties | 2 +- debian/changelog | 13 ++++++++++-- debian/control | 16 ++++++++------- debian/copyright | 5 +++++ debian/get-orig-source.sh | 8 +++++++- debian/patches/30_fix-contrib-ant-libs.dpatch | 3 ++- .../patches/40_fix-contrib-benchmark-libs.dpatch | 3 ++- debian/patches/50_fix-contrib-db-libs.dpatch | 3 ++- debian/patches/55_fix-contrib-db-je-libs.dpatch | 3 ++- debian/patches/60_fix-contrib-lucli-libs.dpatch | 3 ++- debian/patches/61_lucli-script.dpatch | 3 ++- debian/patches/70_fix-contrib-regex-libs.dpatch | 3 ++- debian/rules | 23 ++++++++++++---------- 13 files changed, 60 insertions(+), 28 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties index a07b79f..6c25d61 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.2.0 +version=2.3.0 # javacc settings used by Lucene build #javacc.jar.dir=/usr/share/java diff --git a/debian/changelog b/debian/changelog index 87a8464..7295145 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -lucene2 (2.3.0-1) UNRELEASED; urgency=low +lucene2 (2.3.0+ds1-1~pre1) unstable; urgency=low + [ Varun Hiremath ] * Not released yet because tests fail -> lucene2-2.3.0/build.xml:570: Contrib tests failed! @@ -19,7 +20,15 @@ lucene2 (2.3.0-1) UNRELEASED; urgency=low + Bump debhelper compat to 6 + Bump Standards-Version to 3.7.3 - -- Varun Hiremath <[email protected]> Sat, 26 Jan 2008 15:26:56 +0530 + [ 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 + + -- Jan-Pascal van Best <[email protected]> Thu, 31 Jan 2008 16:49:27 +0100 lucene2 (2.2.0-2) unstable; urgency=low diff --git a/debian/control b/debian/control index e2dd83f..0dc63aa 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,10 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Jan-Pascal van Best <[email protected]>, Barry Hawkins <[email protected]>, Jeff Breidenbach <[email protected]>, Michael Koch <[email protected]> -Build-Depends: cdbs (>= 0.4.49), debhelper (>= 6), dpatch (>= 2.0), +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), sun-java5-jre, sun-java5-jdk, ant-optional, javacc, junit Build-Depends-Indep: libjtidy-java (>= 7), @@ -12,14 +15,12 @@ Build-Depends-Indep: libjtidy-java (>= 7), 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), libdb-je-java Standards-Version: 3.7.3 -Homepage: http://lucene.apache.org/java/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/lucene2/ -Vcs-svn: svn://svn.debian.org/svn/pkg-java/trunk/lucene2/ Package: liblucene2-java Architecture: all @@ -29,6 +30,7 @@ Depends: sun-java5-jre | sun-java6-jre, 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), @@ -39,9 +41,9 @@ Description: Full-text search engine library for Java(TM) 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 benchmark demos highlighter lucli memory - queries regex similarity snowball spellchecker surround swing wordnet - xml-query-parser + 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 diff --git a/debian/copyright b/debian/copyright index 5928a05..6583da2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -215,3 +215,8 @@ License: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + +The Debian packaging (the files under debian/) is +Copyright 2007 Jan-Pascal van Best <[email protected]>. It is +licensed under the terms of the Apache License, version 2.0, as shown +above. diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh index 218408d..5f639ff 100755 --- a/debian/get-orig-source.sh +++ b/debian/get-orig-source.sh @@ -4,11 +4,12 @@ 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_$VERSION.orig.tar +SOURCETAR=$DESTDIR/lucene2_$DEBIAN_SOURCE_VERSION.orig.tar KEYURL="http://www.apache.org/dist/lucene/java/KEYS"; KEYFILE="debian/KEYS" @@ -42,6 +43,11 @@ 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 diff --git a/debian/patches/30_fix-contrib-ant-libs.dpatch b/debian/patches/30_fix-contrib-ant-libs.dpatch index 5ed1e83..bf627de 100755 --- a/debian/patches/30_fix-contrib-ant-libs.dpatch +++ b/debian/patches/30_fix-contrib-ant-libs.dpatch @@ -2,7 +2,8 @@ ## 30_fix-contrib-ant-libs.dpatch by Jan-Pascal van Best <[email protected]> ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Link contrib/ant to the libraries from /usr/share/java instead of +## DP: to the (removed) libraries from lib/ @DPATCH@ diff -urNad trunk~/contrib/ant/build.xml trunk/contrib/ant/build.xml diff --git a/debian/patches/40_fix-contrib-benchmark-libs.dpatch b/debian/patches/40_fix-contrib-benchmark-libs.dpatch index 75dbdb8..534a125 100755 --- a/debian/patches/40_fix-contrib-benchmark-libs.dpatch +++ b/debian/patches/40_fix-contrib-benchmark-libs.dpatch @@ -2,7 +2,8 @@ ## 40_fix-contrib-benchmark-libs.dpatch by Jan-Pascal van Best <[email protected]> ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Link contrib/benchmark to the libraries from /usr/share/java instead of +## DP: to the (removed) libraries from lib/ @DPATCH@ diff -urNad lucene2-2.3.0~/contrib/benchmark/build.xml lucene2-2.3.0/contrib/benchmark/build.xml diff --git a/debian/patches/50_fix-contrib-db-libs.dpatch b/debian/patches/50_fix-contrib-db-libs.dpatch index 28045bb..6e479cc 100755 --- a/debian/patches/50_fix-contrib-db-libs.dpatch +++ b/debian/patches/50_fix-contrib-db-libs.dpatch @@ -2,7 +2,8 @@ ## 50_fix-contrib-db-libs.dpatch by Jan-Pascal van Best <[email protected]> ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Link contrib/db/bdb to the libraries from /usr/share/java instead of +## DP: to the (removed) libraries from lib/ @DPATCH@ diff -urNad 2.2.0~/contrib/db/bdb/build.xml 2.2.0/contrib/db/bdb/build.xml diff --git a/debian/patches/55_fix-contrib-db-je-libs.dpatch b/debian/patches/55_fix-contrib-db-je-libs.dpatch index 0111620..196ccc0 100755 --- a/debian/patches/55_fix-contrib-db-je-libs.dpatch +++ b/debian/patches/55_fix-contrib-db-je-libs.dpatch @@ -2,7 +2,8 @@ ## 55_fix-contrib-db-jre-compilation.dpatch by <[email protected]> ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Link contrib/db/bdb-je to the libraries from /usr/share/java instead of +## DP: to the (removed) libraries from lib/ @DPATCH@ diff -urNad lucene2-2.2.0~/contrib/db/bdb-je/build.xml lucene2-2.2.0/contrib/db/bdb-je/build.xml diff --git a/debian/patches/60_fix-contrib-lucli-libs.dpatch b/debian/patches/60_fix-contrib-lucli-libs.dpatch index a36471c..4d26068 100755 --- a/debian/patches/60_fix-contrib-lucli-libs.dpatch +++ b/debian/patches/60_fix-contrib-lucli-libs.dpatch @@ -2,7 +2,8 @@ ## 60_fix-contrib-lucli-libs.dpatch by Jan-Pascal van Best <[email protected]> ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Link contrib/lucli to the libraries from /usr/share/java instead of +## DP: to the (removed) libraries from lib/ @DPATCH@ diff -urNad trunk~/contrib/lucli/build.xml trunk/contrib/lucli/build.xml diff --git a/debian/patches/61_lucli-script.dpatch b/debian/patches/61_lucli-script.dpatch index 9a586ba..6aa4a65 100755 --- a/debian/patches/61_lucli-script.dpatch +++ b/debian/patches/61_lucli-script.dpatch @@ -2,7 +2,8 @@ ## 61_lucli-script.dpatch by Jan-Pascal van Best <[email protected]> ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Fix the lucli run.sh script to use the jar files in the +## DP: standard locations. @DPATCH@ diff -urNad trunk~/contrib/lucli/run.sh trunk/contrib/lucli/run.sh diff --git a/debian/patches/70_fix-contrib-regex-libs.dpatch b/debian/patches/70_fix-contrib-regex-libs.dpatch index a66acfd..b6c251f 100755 --- a/debian/patches/70_fix-contrib-regex-libs.dpatch +++ b/debian/patches/70_fix-contrib-regex-libs.dpatch @@ -2,7 +2,8 @@ ## 70_fix-contrib-regex-libs.dpatch by Jan-Pascal van Best <[email protected]> ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Link contrib/regex to the libraries from /usr/share/java instead of +## DP: to the (removed) libraries from lib/ @DPATCH@ diff -urNad trunk~/contrib/regex/build.xml trunk/contrib/regex/build.xml diff --git a/debian/rules b/debian/rules index 79a1871..d7b2ccf 100755 --- a/debian/rules +++ b/debian/rules @@ -21,32 +21,35 @@ DEB_ANT_CLEAN_TARGET := clean DEB_JARS = ant-nodeps ant-junit junit # Upstream Lucene name -UPSTREAM_BASENAME := lucene-$(DEB_UPSTREAM_VERSION) +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 # remove keyring, since it is a binary file rm -f debian/lucene-keyring.gpg # remove all javacc-generated files from src and contrib, except those - # those are not regenerated properly + # 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-$(DEB_UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java - ln -s lucene-core-$(DEB_UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java/lucene-core.jar + 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 \*.jar` ; \ + CONTRIB_JARS=`find build/contrib/ -name \*-$(UPSTREAM_VERSION).jar` ; \ for jarfile in $$CONTRIB_JARS; do \ - echo $$jarfile ; \ install -m 0644 "$$jarfile" $(CURDIR)/debian/liblucene2-java/usr/share/java ; \ - CONTRIB=`echo $$jarfile | sed "s/.*\\/lucene-\\(.*\\)-.*.jar/\\1/"` ; \ - ln -s lucene-$$CONTRIB-$(DEB_UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java/lucene-$$CONTRIB.jar ; \ + 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 @@ -55,14 +58,14 @@ install/liblucene2-java:: 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:: +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/ install -d $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo - install -m 644 build/lucene-demos-$(DEB_UPSTREAM_VERSION).jar $(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: -- 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
