[pkg-java] r5576 - in trunk/lucene2/debian: . patches
janpascal-guest at alioth.debian.org
janpascal-guest at alioth.debian.org
Thu Jan 31 15:50:33 UTC 2008
Author: janpascal-guest
Date: 2008-01-31 15:50:33 +0000 (Thu, 31 Jan 2008)
New Revision: 5576
Modified:
trunk/lucene2/debian/ant.properties
trunk/lucene2/debian/changelog
trunk/lucene2/debian/control
trunk/lucene2/debian/copyright
trunk/lucene2/debian/get-orig-source.sh
trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.dpatch
trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch
trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch
trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch
trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.dpatch
trunk/lucene2/debian/patches/61_lucli-script.dpatch
trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.dpatch
trunk/lucene2/debian/rules
Log:
* 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
Modified: trunk/lucene2/debian/ant.properties
===================================================================
--- trunk/lucene2/debian/ant.properties 2008-01-30 04:41:15 UTC (rev 5575)
+++ trunk/lucene2/debian/ant.properties 2008-01-31 15:50:33 UTC (rev 5576)
@@ -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
Modified: trunk/lucene2/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog 2008-01-30 04:41:15 UTC (rev 5575)
+++ trunk/lucene2/debian/changelog 2008-01-31 15:50:33 UTC (rev 5576)
@@ -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,8 +20,16 @@
+ Bump debhelper compat to 6
+ Bump Standards-Version to 3.7.3
- -- Varun Hiremath <varun at debian.org> 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 <janpascal at vanbest.org> Thu, 31 Jan 2008 16:49:27 +0100
+
lucene2 (2.2.0-2) unstable; urgency=low
* Use libdb4.5-java instead of libdb4.3-java, which is removed from Debian.
Modified: trunk/lucene2/debian/control
===================================================================
--- trunk/lucene2/debian/control 2008-01-30 04:41:15 UTC (rev 5575)
+++ trunk/lucene2/debian/control 2008-01-31 15:50:33 UTC (rev 5576)
@@ -4,7 +4,10 @@
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>
-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 @@
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 @@
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 @@
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
Modified: trunk/lucene2/debian/copyright
===================================================================
--- trunk/lucene2/debian/copyright 2008-01-30 04:41:15 UTC (rev 5575)
+++ trunk/lucene2/debian/copyright 2008-01-31 15:50:33 UTC (rev 5576)
@@ -215,3 +215,8 @@
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 <janpascal at vanbest.org>. It is
+licensed under the terms of the Apache License, version 2.0, as shown
+above.
Modified: trunk/lucene2/debian/get-orig-source.sh
===================================================================
--- trunk/lucene2/debian/get-orig-source.sh 2008-01-30 04:41:15 UTC (rev 5575)
+++ trunk/lucene2/debian/get-orig-source.sh 2008-01-31 15:50:33 UTC (rev 5576)
@@ -4,11 +4,12 @@
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 @@
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
Modified: trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.dpatch 2008-01-30 04:41:15 UTC (rev 5575)
+++ trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.dpatch 2008-01-31 15:50:33 UTC (rev 5576)
@@ -2,7 +2,8 @@
## 30_fix-contrib-ant-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
##
## 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
Modified: trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch 2008-01-30 04:41:15 UTC (rev 5575)
+++ trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch 2008-01-31 15:50:33 UTC (rev 5576)
@@ -2,7 +2,8 @@
## 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: 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
Modified: trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch 2008-01-30 04:41:15 UTC (rev 5575)
+++ trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch 2008-01-31 15:50:33 UTC (rev 5576)
@@ -2,7 +2,8 @@
## 50_fix-contrib-db-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
##
## 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
Modified: trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch 2008-01-30 04:41:15 UTC (rev 5575)
+++ trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch 2008-01-31 15:50:33 UTC (rev 5576)
@@ -2,7 +2,8 @@
## 55_fix-contrib-db-jre-compilation.dpatch by <varun at debian.org>
##
## 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
Modified: trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.dpatch 2008-01-30 04:41:15 UTC (rev 5575)
+++ trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.dpatch 2008-01-31 15:50:33 UTC (rev 5576)
@@ -2,7 +2,8 @@
## 60_fix-contrib-lucli-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
##
## 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
Modified: trunk/lucene2/debian/patches/61_lucli-script.dpatch
===================================================================
--- trunk/lucene2/debian/patches/61_lucli-script.dpatch 2008-01-30 04:41:15 UTC (rev 5575)
+++ trunk/lucene2/debian/patches/61_lucli-script.dpatch 2008-01-31 15:50:33 UTC (rev 5576)
@@ -2,7 +2,8 @@
## 61_lucli-script.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
##
## 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
Modified: trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.dpatch 2008-01-30 04:41:15 UTC (rev 5575)
+++ trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.dpatch 2008-01-31 15:50:33 UTC (rev 5576)
@@ -2,7 +2,8 @@
## 70_fix-contrib-regex-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
##
## 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
Modified: trunk/lucene2/debian/rules
===================================================================
--- trunk/lucene2/debian/rules 2008-01-30 04:41:15 UTC (rev 5575)
+++ trunk/lucene2/debian/rules 2008-01-31 15:50:33 UTC (rev 5576)
@@ -21,32 +21,35 @@
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 -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:
More information about the pkg-java-commits
mailing list