[pkg-java] r10145 - trunk/lucene2/debian

[Jan-Pascal van Best]

Author: janpascal-guest
Date: 2009-08-21 11:52:34 +0000 (Fri, 21 Aug 2009)
New Revision: 10145

Modified:
   trunk/lucene2/debian/ant.properties
   trunk/lucene2/debian/changelog
   trunk/lucene2/debian/control
   trunk/lucene2/debian/get-orig-source.sh
   trunk/lucene2/debian/rules
Log:
2.9.0-dev as of 20090821 now builds

Modified: trunk/lucene2/debian/ant.properties
===================================================================
--- trunk/lucene2/debian/ant.properties	2009-08-21 09:36:41 UTC (rev 10144)
+++ trunk/lucene2/debian/ant.properties	2009-08-21 11:52:34 UTC (rev 10145)
@@ -2,7 +2,7 @@
 
 # Version number for upstream source; errors in the 
 # upstream source require that it be overridden.
-version=2.4.1
+version=2.9.0~rc0
 
 # javacc settings used by Lucene build
 javacc.home=/usr/share/java

Modified: trunk/lucene2/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog	2009-08-21 09:36:41 UTC (rev 10144)
+++ trunk/lucene2/debian/changelog	2009-08-21 11:52:34 UTC (rev 10145)
@@ -1,9 +1,10 @@
-lucene2 (2.9-dev+ds1-1) unstable; urgency=low
+lucene2 (2.9.0~rc0+ds1-1) unstable; urgency=low
 
   * New upstream version
   * Updated Debian patches for Lucene 2.9
+  * Bumped standards version to 3.8.2 (no changes needed)
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Thu, 20 Aug 2009 09:17:55 +0200
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 21 Aug 2009 13:51:10 +0200
 
 lucene2 (2.4.1+ds1-1) unstable; urgency=low
 

Modified: trunk/lucene2/debian/control
===================================================================
--- trunk/lucene2/debian/control	2009-08-21 09:36:41 UTC (rev 10144)
+++ trunk/lucene2/debian/control	2009-08-21 11:52:34 UTC (rev 10145)
@@ -21,7 +21,7 @@
  libcommons-logging-java (>= 1.0.4), 
  libcommons-beanutils-java (>= 1.7.0),
  libcommons-compress-java
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 
 Package: liblucene2-java
 Architecture: all

Modified: trunk/lucene2/debian/get-orig-source.sh
===================================================================
--- trunk/lucene2/debian/get-orig-source.sh	2009-08-21 09:36:41 UTC (rev 10144)
+++ trunk/lucene2/debian/get-orig-source.sh	2009-08-21 11:52:34 UTC (rev 10145)
@@ -4,11 +4,13 @@
 
 URL=`echo $DEHS | xsltproc debian/uscan-url.xslt -`
 VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -`
+UPSTREAM_VERSION="2.9-dev"
+VERSION="2.9.0~rc0"
 DEBIAN_SOURCE_VERSION="$VERSION+ds1"
 
 DESTDIR=$PWD/..
-SOURCEFILE=$DESTDIR/lucene-$VERSION-src.tar.gz
-SIGFILE=$DESTDIR/lucene-$VERSION-src.tar.gz.asc
+SOURCEFILE=$DESTDIR/lucene-$UPSTREAM_VERSION-src.tar.gz
+SIGFILE=$DESTDIR/lucene-$UPSTREAM_VERSION-src.tar.gz.asc
 SOURCETAR=$DESTDIR/lucene2_$DEBIAN_SOURCE_VERSION.orig.tar
 
 KEYURL="http://www.apache.org/dist/lucene/java/KEYS"
@@ -16,9 +18,12 @@
 KEYRING="debian/lucene-keyring.gpg"
 
 # Download source tarball and signature file
-wget "$URL" -O $SOURCEFILE
-wget "$URL.asc" -O $SIGFILE
+if [ ! -r "$SOURCEFILE" ]; then
+  wget "$URL" -O $SOURCEFILE
+fi
 
+#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

Modified: trunk/lucene2/debian/rules
===================================================================
--- trunk/lucene2/debian/rules	2009-08-21 09:36:41 UTC (rev 10144)
+++ trunk/lucene2/debian/rules	2009-08-21 11:52:34 UTC (rev 10145)
@@ -33,6 +33,8 @@
 	rm -rf $(CURDIR)/contrib/benchmark/work/index
 	rm -rf $(CURDIR)/contrib/benchmark/work/reuters
 	rm -rf $(CURDIR)/contrib/benchmark/work/reuters-out
+	# Tags for backward compatibility testing
+	rm -rf $(CURDIR)/tags
 	# remove keyring, since it is a binary file
 	rm -f debian/lucene-keyring.gpg
 	rm -f debian/KEYS
@@ -56,10 +58,6 @@
 	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
@@ -94,7 +92,6 @@
 
 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 ; \