[pkg-java] r5064 - trunk/trove/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-12-16 17:44:42 +0000 (Sun, 16 Dec 2007)
New Revision: 5064

Modified:
   trunk/trove/debian/changelog
   trunk/trove/debian/control
   trunk/trove/debian/orig-tar.sh
   trunk/trove/debian/rules
   trunk/trove/debian/watch
Log:
* new upstream release
* Remove reference to substance in README.Debian-source.
* Clean up the debian directory.
* Change Standards-Version: 3.7.3.
* Add Homepage and Vcs headers to debian/control.

Modified: trunk/trove/debian/changelog
===================================================================
--- trunk/trove/debian/changelog	2007-12-16 14:00:17 UTC (rev 5063)
+++ trunk/trove/debian/changelog	2007-12-16 17:44:42 UTC (rev 5064)
@@ -1,9 +1,12 @@
-trove (2.0.1.dfsg.1-2) unstable; urgency=low
+trove (2.0.2-1) unstable; urgency=low
 
-  * NOT RELEASED YET
-  * remove reference to substance in README.Debian-source
+  * new upstream release
+  * Remove reference to substance in README.Debian-source.
+  * Clean up the debian directory.
+  * Change Standards-Version: 3.7.3.
+  * Add Homepage and Vcs headers to debian/control.
 
- -- Torsten Werner <twerner at debian.org>  Sat, 13 Oct 2007 19:17:25 +0200
+ -- Torsten Werner <twerner at debian.org>  Sun, 16 Dec 2007 18:44:02 +0100
 
 trove (2.0.1.dfsg.1-1) unstable; urgency=low
 

Modified: trunk/trove/debian/control
===================================================================
--- trunk/trove/debian/control	2007-12-16 14:00:17 UTC (rev 5063)
+++ trunk/trove/debian/control	2007-12-16 17:44:42 UTC (rev 5064)
@@ -6,7 +6,10 @@
  Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 4.2.30), cdbs
 Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.69-2), ant
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Homepage: http://trove4j.sourceforge.net
+Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/trove
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/trove/
 
 Package: libtrove-java
 Architecture: all

Modified: trunk/trove/debian/orig-tar.sh
===================================================================
--- trunk/trove/debian/orig-tar.sh	2007-12-16 14:00:17 UTC (rev 5063)
+++ trunk/trove/debian/orig-tar.sh	2007-12-16 17:44:42 UTC (rev 5064)
@@ -2,13 +2,12 @@
 
 # called by uscan with '--upstream-version' <version> <file>
 
-VERSION=$(dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
-TAR=../trove_$VERSION.orig.tar.gz
+TAR=$3
 
 # clean up the upstream tarball
-tar -x -z -f $3
+tar -x -z -f $TAR
 tar -c -z -f $TAR --exclude '*.jar' --exclude '*/javadocs/*' trove-*/
-rm -rf $3 trove-*/
+rm -rf trove-*/
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then

Modified: trunk/trove/debian/rules
===================================================================
--- trunk/trove/debian/rules	2007-12-16 14:00:17 UTC (rev 5063)
+++ trunk/trove/debian/rules	2007-12-16 17:44:42 UTC (rev 5064)
@@ -5,26 +5,22 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-VERSION := `expr match $(DEB_UPSTREAM_VERSION) '\(.*\)\.dfsg.*'`
-
-JAVA_HOME_DIRS := /usr/lib/jvm/java-gcj/
-ANT_HOME := /usr/share/ant
-
-DEB_JARS := 
+JAVA_HOME            := /usr/lib/jvm/java-gcj
 DEB_ANT_BUILD_TARGET := jar javadoc
 
 cleanbuilddir::
 	$(RM) -r output
 
 binary-post-install/libtrove-java::
-	dh_install -plibtrove-java output/lib/trove-$(VERSION).jar \
-			/usr/share/java/
-	dh_link -plibtrove-java /usr/share/java/trove-$(VERSION).jar \
-			/usr/share/java/trove.jar
+	dh_install -plibtrove-java \
+	  output/lib/trove-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/
+	dh_link -plibtrove-java \
+	  /usr/share/java/trove-$(DEB_UPSTREAM_VERSION).jar \
+	  /usr/share/java/trove.jar
 
 binary-post-install/libtrove-java-doc::
-	dh_install -plibtrove-java-doc output/javadocs/* \
-			/usr/share/doc/libtrove-java-doc/api
+	dh_install -plibtrove-java-doc \
+	  output/javadocs/* /usr/share/doc/libtrove-java-doc/api
 
 get-orig-source:
 	uscan --upstream-version 0 --rename

Modified: trunk/trove/debian/watch
===================================================================
--- trunk/trove/debian/watch	2007-12-16 14:00:17 UTC (rev 5063)
+++ trunk/trove/debian/watch	2007-12-16 17:44:42 UTC (rev 5064)
@@ -1,7 +1,5 @@
-# watch control file for uscan
-version=2
+version=3
 
-opts=dversionmangle=s/\.dfsg\.\d+$// \
-  http://heanet.dl.sourceforge.net/sourceforge/trove4j/trove-(\d\.\d\.\d)\.tar\.gz \
+http://heanet.dl.sourceforge.net/sourceforge/trove4j/trove-(\d\.\d\.\d)\.tar\.gz \
   debian debian/orig-tar.sh