[pkg-java] r15587 - trunk/libbtm-java/debian

[Steffen Möller]

Author: moeller
Date: 2011-12-23 23:18:01 +0000 (Fri, 23 Dec 2011)
New Revision: 15587

Modified:
   trunk/libbtm-java/debian/changelog
   trunk/libbtm-java/debian/compat
   trunk/libbtm-java/debian/control
   trunk/libbtm-java/debian/copyright
   trunk/libbtm-java/debian/orig-tar.sh
   trunk/libbtm-java/debian/rules
   trunk/libbtm-java/debian/watch
Log:
Update provided by Brian. Not yet uploaded.


Modified: trunk/libbtm-java/debian/changelog
===================================================================
--- trunk/libbtm-java/debian/changelog	2011-12-23 21:08:52 UTC (rev 15586)
+++ trunk/libbtm-java/debian/changelog	2011-12-23 23:18:01 UTC (rev 15587)
@@ -1,3 +1,30 @@
+libbtm-java (2.1.2-1) UNRELEASED; urgency=low
+
+  [ by sponsor Steffen Moeller ]
+  * Added pkg-java member Brian to uploaders.
+  * Added DNMU flag
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Fri, 23 Dec 2011 23:56:40 +0100
+
+libbtm-java (2.1.2-0ubuntu3) precise; urgency=low
+
+  * Added missing ant-optional build-dep
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Wed, 14 Dec 2011 23:31:32 +0000
+
+libbtm-java (2.1.2-0ubuntu2) precise; urgency=low
+
+  * Added missing junit build-dep
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Wed, 14 Dec 2011 18:05:55 -0500
+
+libbtm-java (2.1.2-0ubuntu1) precise; urgency=low
+
+  * New upstream release
+  * Bumped Standards-Version (no changes)
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Wed, 07 Dec 2011 17:06:29 +0000
+
 libbtm-java (1.3.3-1) unstable; urgency=low
 
   * Initial Release (closes: #581671).

Modified: trunk/libbtm-java/debian/compat
===================================================================
--- trunk/libbtm-java/debian/compat	2011-12-23 21:08:52 UTC (rev 15586)
+++ trunk/libbtm-java/debian/compat	2011-12-23 23:18:01 UTC (rev 15587)
@@ -1 +1 @@
-6
+7

Modified: trunk/libbtm-java/debian/control
===================================================================
--- trunk/libbtm-java/debian/control	2011-12-23 21:08:52 UTC (rev 15586)
+++ trunk/libbtm-java/debian/control	2011-12-23 23:18:01 UTC (rev 15587)
@@ -2,11 +2,11 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), maven-repo-helper, gcj-jdk, ant,
+Uploaders: Torsten Werner <twerner at debian.org>, Brian Thomason <brian.thomason at eucalyptus.com>
+Build-Depends: debhelper (>= 7.0.50~), maven-repo-helper, default-jdk, ant,
  libgeronimo-jta-1.0.1b-spec-java, libgeronimo-jms-1.1-spec-java,
- libslf4j-java
-Standards-Version: 3.8.4
+ libslf4j-java, libmockito-java, junit, ant-optional
+Standards-Version: 3.9.2
 Homepage: http://docs.codehaus.org/display/BTM/Home
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libbtm-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libbtm-java/

Modified: trunk/libbtm-java/debian/copyright
===================================================================
--- trunk/libbtm-java/debian/copyright	2011-12-23 21:08:52 UTC (rev 15586)
+++ trunk/libbtm-java/debian/copyright	2011-12-23 23:18:01 UTC (rev 15587)
@@ -1,7 +1,5 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Bitronix JTA Transaction Manager
-Maintainer: Bitronix
-Source: http://svn.codehaus.org/btm/branches/
+Format: http://dep.debian.net/deps/dep5/
+Source: http://docs.codehaus.org/display/BTM/Download
 
 Files: *
 Copyright: 2005-2010, Bitronix

Modified: trunk/libbtm-java/debian/orig-tar.sh
===================================================================
--- trunk/libbtm-java/debian/orig-tar.sh	2011-12-23 21:08:52 UTC (rev 15586)
+++ trunk/libbtm-java/debian/orig-tar.sh	2011-12-23 23:18:01 UTC (rev 15587)
@@ -1,14 +1,14 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
-DIR=libbtm-java-$2
+DIR=btm-dist-$2
 TAR=../libbtm-java_$2.orig.tar.gz
 
-# clean up the upstream tarball
-svn export http://svn.codehaus.org/btm/branches/$2/ $DIR
-GZIP=--best tar czf $TAR --exclude '*.jar' $DIR
-rm -rf $DIR ../$2
+unzip $3
 
+GZIP=--best tar czf $TAR --exclude='*.jar' --exclude='*.tlog' $DIR
+rm -rf $DIR ../$2 $3
+
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then
     . .svn/deb-layout

Modified: trunk/libbtm-java/debian/rules
===================================================================
--- trunk/libbtm-java/debian/rules	2011-12-23 21:08:52 UTC (rev 15586)
+++ trunk/libbtm-java/debian/rules	2011-12-23 23:18:01 UTC (rev 15587)
@@ -2,10 +2,10 @@
 
 VERSION = $(shell dpkg-parsechangelog | sed -n 's,^Version: \(.*\)-.*,\1,p')
 
-export JAVA_HOME := /usr/lib/jvm/java-gcj/
+export JAVA_HOME := /usr/lib/jvm/default-java
 
 D := /usr/share/java/
-export CLASSPATH := $(D)slf4j-api.jar:$(D)geronimo-jms-1.1-spec.jar:$(D)geronimo-jta-1.0.1b-spec.jar
+export CLASSPATH := $(D)slf4j-api.jar:$(D)geronimo-jms-1.1-spec.jar:$(D)geronimo-jta-1.0.1b-spec.jar:$(D)mockito-core.jar
 
 %:
 	dh $@
@@ -17,5 +17,12 @@
 	mh_installpom -plibbtm-java -e$(VERSION) pom.xml
 	mh_installjar -plibbtm-java -l -e$(VERSION) pom.xml dist/btm-$(VERSION).jar
 
+override_dh_clean:
+	dh_clean
+	rm -rf $(CURDIR)/debian/.mh
+	rm -rf target/*
+	rm -f TESTS-TestSuites.xml
+	rm -f src/bitronix/tm/Version.java
+
 get-orig-source:
-	uscan --force-download --download-version $(VERSION) --rename
+	uscan --debug --force-download --download-version $(VERSION) --rename

Modified: trunk/libbtm-java/debian/watch
===================================================================
--- trunk/libbtm-java/debian/watch	2011-12-23 21:08:52 UTC (rev 15586)
+++ trunk/libbtm-java/debian/watch	2011-12-23 23:18:01 UTC (rev 15587)
@@ -1,3 +1,3 @@
 version=3
 
-http://svn.codehaus.org/btm/branches/ (\d[\d.]*)/ debian debian/orig-tar.sh
+http://docs.codehaus.org/display/BTM/Download/ http://bitronix.be/downloads/btm-dist-(.+).zip debian debian/orig-tar.sh