[pkg-java] r3961 - in trunk/lucene2/debian: . patches
janpascal-guest at alioth.debian.org
janpascal-guest at alioth.debian.org
Wed Aug 1 20:31:34 UTC 2007
Author: janpascal-guest
Date: 2007-08-01 20:31:34 +0000 (Wed, 01 Aug 2007)
New Revision: 3961
Added:
trunk/lucene2/debian/patches/61_lucli-script.dpatch
Modified:
trunk/lucene2/debian/README.Debian
trunk/lucene2/debian/control
trunk/lucene2/debian/copyright
trunk/lucene2/debian/download-upstream
trunk/lucene2/debian/patches/00list
trunk/lucene2/debian/rules
Log:
Handled comments by Jeff and Michael
Modified: trunk/lucene2/debian/README.Debian
===================================================================
--- trunk/lucene2/debian/README.Debian 2007-08-01 20:31:29 UTC (rev 3960)
+++ trunk/lucene2/debian/README.Debian 2007-08-01 20:31:34 UTC (rev 3961)
@@ -1,9 +1,6 @@
-Debian notes for Lucene-2.1.0
+Debian notes for Lucene-2.2.0
-----------------------------
-Lucene 2.1.0 is packaged separately from Lucene 1.4.3, because of
-API changes between the two versions.
-
There are two binary packages:
- liblucene2-java contains the core lucene library and most
contrib libraries
@@ -18,28 +15,26 @@
Google Data API (com.google.gdata) packages are not in Debian
The Javadoc(TM) for Lucene are included in the liblucene2-java-doc
-package, in /usr/share/doc/liblucene2-java-doc/docs/api FIXME
+package, in /usr/share/doc/liblucene2-java-doc/docs/api
The Lucene demo applications are included in the liblucene2-java-doc
-package, in /usr/share/doc/liblucene2-java-doc/demo.
+package, in /usr/share/doc/liblucene2-java-doc/demo. The demonstration
+applications require additional configuration to be used. To configure
+and run the demonstration command-line applications for Lucene, see
+the following documentation and source code walkthrough:
+ /usr/share/doc/liblucene2-java-doc/docs/demo.html
+ /usr/share/doc/liblucene2-java-doc/docs/demo2.html
-The demonstration applications require additional configuration to be
-used. To configure and run the demonstration command-line applications
-for Lucene, see the following documentation and source code walkthrough:
-
- /usr/share/doc/liblucene-java-doc/docs/demo.html
- /usr/share/doc/liblucene-java-doc/docs/demo2.html
-
For information on configuring the Lucene web application to be run in
a Java(TM) web container such as Tomcat, see the following
documentation and source code walkthrough:
- /usr/share/doc/liblucene-java-doc/docs/demo3.html
- /usr/share/doc/liblucene-java-doc/docs/demo4.html
+ /usr/share/doc/liblucene2-java-doc/docs/demo3.html
+ /usr/share/doc/liblucene2-java-doc/docs/demo4.html
Several modifications are required if you wish to run the Lucene web
-application on a stock Debian tomcat4 configuration. Note that Debian's
+application on a stock Debian tomcat5.5 configuration. Note that Debian's
default Tomcat configuration may have changed since these instructions
were written.
@@ -61,4 +56,5 @@
permission java.io.FilePermission "/var/lib/tomcat4/temp/*", "read,write,delete";
-- Barry Hawkins <barryh at case.internal.alltc.org>, Fri, 5 May 2006 23:53:38 -0400
+ Jan-Pascal van Best <janpascal at vanbest.org>, Thu, 12 Jul 2007 07:57:20 +0200
Modified: trunk/lucene2/debian/control
===================================================================
--- trunk/lucene2/debian/control 2007-08-01 20:31:29 UTC (rev 3960)
+++ trunk/lucene2/debian/control 2007-08-01 20:31:34 UTC (rev 3961)
@@ -6,7 +6,7 @@
Jeff Breidenbach <jab at debian.org>, Michael Koch <konqueror at gmx.de>
XS-Vcs-Browser: http://www.vanbest.org/websvn/lucene2
XS-Vcs-svn: http://svn.vanbest.org/svn/lucene2
-Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0), sun-java5-jre, sun-java5-jdk, ant,
+Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0), sun-java5-jre, sun-java5-jdk,
ant-optional, javacc, junit, libxalan2-java
Build-Depends-Indep: libjtidy-java (>= 7),
libjline-java (>= 0.9.5),
Modified: trunk/lucene2/debian/copyright
===================================================================
--- trunk/lucene2/debian/copyright 2007-08-01 20:31:29 UTC (rev 3960)
+++ trunk/lucene2/debian/copyright 2007-08-01 20:31:34 UTC (rev 3961)
@@ -1,10 +1,15 @@
This package was debianized by Jan-Pascal van Best <janpascal at vanbest.org> on
-Wed, 11 Apr 2007 14:00:46 +0200.
+Thu, 12 Jul 2007 08:21:19 +0200
It was downloaded from
-http://www.apache.org/dist/lucene/java/lucene-2.1.0-src.tar.gz
+http://www.apache.org/dist/lucene/java/lucene-2.2.0-src.tar.gz
-Copyright Holder: Doug Cutting <cutting at apache.org>, Erik Hatcher
+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 <cutting at apache.org>, Erik Hatcher
<ehatcher at apacher.org>, Otis Gospodnetic <otis at apache.org> et.al.
License:
Modified: trunk/lucene2/debian/download-upstream
===================================================================
--- trunk/lucene2/debian/download-upstream 2007-08-01 20:31:29 UTC (rev 3960)
+++ trunk/lucene2/debian/download-upstream 2007-08-01 20:31:34 UTC (rev 3961)
@@ -1,19 +1,22 @@
#!/bin/bash
-DEHS=`( uscan --dehs ; echo "</dehs>" )`
+DEHS=`( uscan --dehs )`
URL=`echo $DEHS | xsltproc debian/uscan-url.xslt -`
VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -`
-SOURCEFILE=../lucene2_$VERSION.orig.tar.gz
-SIGFILE=../lucene2_$VERSION.orig.tar.gz.asc
+DESTDIR=$PWD/..
+PRISTINE_SOURCEFILE=$DESTDIR/lucene-$VERSION-src.tar.gz
+SIGFILE=$DESTDIR/lucene-$VERSION-src.tar.gz.asc
+SOURCETAR=$DESTDIR/lucene2_$VERSION.orig.tar
+SOURCETARGZ=$DESTDIR/lucene2_$VERSION.orig.tar.gz
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" -O $PRISTINE_SOURCEFILE
wget "$URL.asc" -O $SIGFILE
# If necessary, recreate keyring used for signing
@@ -28,7 +31,25 @@
fi
# Check signature
-gpgv --quiet --keyring $KEYRING $SIGFILE $SOURCEFILE
+gpgv --quiet --keyring $KEYRING $SIGFILE $PRISTINCE_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 $PRISTINE_SOURCEFILE -C $TEMPDIR
+
+echo "Removing third party jars..."
+find $TEMPDIR -name \*.jar -exec rm {} \;
+
+echo "Packing new orig source tarball $SOURCEFILE..."
+rm -f $SOURCETAR $SOURCETARGZ
+cd $TEMPDIR
+tar cf $SOURCETAR *
+gzip -9 $SOURCETAR
+cd $DESTDIR
+
+echo "Removing tempdir..."
+rm -rf "$TEMPDIR"
+
Modified: trunk/lucene2/debian/patches/00list
===================================================================
--- trunk/lucene2/debian/patches/00list 2007-08-01 20:31:29 UTC (rev 3960)
+++ trunk/lucene2/debian/patches/00list 2007-08-01 20:31:34 UTC (rev 3961)
@@ -6,4 +6,5 @@
50_fix-contrib-db-libs.dpatch
55_disable-db-jre-compilation.dpatch
60_fix-contrib-lucli-libs.dpatch
+61_lucli-script.dpatch
70_fix-contrib-regex-libs.dpatch
Added: trunk/lucene2/debian/patches/61_lucli-script.dpatch
===================================================================
--- trunk/lucene2/debian/patches/61_lucli-script.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/61_lucli-script.dpatch 2007-08-01 20:31:34 UTC (rev 3961)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 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.
+
+ at 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=.
++#!/bin/sh
++
++LUCLI=/usr/share/java
+ LUCLI_MEMORY=128M
+-#JAVA_HOME=/home/dror/j2sdk1.4.1_03/
+-CLASSPATH=${CLASSPATH}:$LUCLI/lib/jline.jar:$LUCLI/lib/lucene.jar:$LUCLI/dist/lucli-dev.jar
++CLASSPATH=${CLASSPATH}:$LUCLI/jline.jar:$LUCLI/lucene-core.jar:$LUCLI/lucene-lucli.jar
+ export CLASSPATH
+-$JAVA_HOME/bin/java -Xmx${LUCLI_MEMORY} lucli.Lucli
++java -Xmx${LUCLI_MEMORY} lucli.Lucli
Property changes on: trunk/lucene2/debian/patches/61_lucli-script.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/lucene2/debian/rules
===================================================================
--- trunk/lucene2/debian/rules 2007-08-01 20:31:29 UTC (rev 3960)
+++ trunk/lucene2/debian/rules 2007-08-01 20:31:34 UTC (rev 3961)
@@ -60,8 +60,7 @@
build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
- # Add here commands to compile the arch part of the package.
- #$(MAKE)
+ # Nothing to do, this package does not have an arch part.
touch build-arch-stamp
build-indep: build-indep-stamp
@@ -73,8 +72,8 @@
$(ANT) jar-core
$(ANT) build-contrib
$(ANT) war-demo
- # Skipping until production time...
- $(ANT) test
+ # Skipping (very time consuming) until production time...
+ # $(ANT) test
$(ANT) javadocs
touch build-indep-stamp
@@ -84,8 +83,6 @@
dh_testroot
rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
- # Add here commands to clean up after the build process.
- # -$(MAKE) clean
$(ANT) clean
# 'ant test' in contrib/db leave some stuff behind...
@@ -127,9 +124,9 @@
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/demo
- install -m 644 build/lucene-demos-$(LUCENE_VERSION).jar $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java/demo/
- install -m 644 build/luceneweb.war $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java/demo/
+ install -d $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo
+ install -m 644 build/lucene-demos-$(LUCENE_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/
dh_install -i
@@ -139,11 +136,10 @@
dh_clean -k -s
dh_installdirs -s
- # Add here commands to install the arch part of the package into
- # debian/tmp.
- # $(MAKE) install DESTDIR=$(CURDIR)/debian/lucene
+ # Nothing to do, this package does not have an arch part.
dh_install -s
+
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
# in another 'make' thread.
@@ -153,28 +149,18 @@
dh_installchangelogs CHANGES.txt
dh_installdocs
dh_installexamples
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_perl
-# dh_python
dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
+
# Build architecture independant packages using the common target.
binary-indep: build-indep install-indep
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
More information about the pkg-java-commits
mailing list