[pkg-java] r16616 - trunk/libjoda-time-java/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-05-13 14:23:24 +0000 (Mon, 13 May 2013)
New Revision: 16616

Modified:
   trunk/libjoda-time-java/debian/changelog
   trunk/libjoda-time-java/debian/control
   trunk/libjoda-time-java/debian/maven.ignoreRules
   trunk/libjoda-time-java/debian/orig-tar.sh
   trunk/libjoda-time-java/debian/watch
Log:
New upstream release (2.2)
Added a build dependency on libmaven-exec-plugin-java (required to compile the timezone data)
Exclude the jar files from the upstream source tarball
Updated Standards-Version to 3.9.4 (no changes)


Modified: trunk/libjoda-time-java/debian/changelog
===================================================================
--- trunk/libjoda-time-java/debian/changelog	2013-05-11 21:49:49 UTC (rev 16615)
+++ trunk/libjoda-time-java/debian/changelog	2013-05-13 14:23:24 UTC (rev 16616)
@@ -1,8 +1,16 @@
-libjoda-time-java (2.1-3) UNRELEASED; urgency=low
+libjoda-time-java (2.2-1) unstable; urgency=low
 
+  * Team upload.
+  * New upstream release
+  * Added a build dependency on libmaven-exec-plugin-java
+    (required to compile the timezone data)
+  * Exclude the jar files from the upstream source tarball
+  * Updated Standards-Version to 3.9.4 (no changes)
+
+  [ Mathieu Malaterre ]
   * Remove self from Uploaders
 
- -- Mathieu Malaterre <malat at debian.org>  Thu, 11 Apr 2013 12:10:23 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 13 May 2013 16:17:14 +0200
 
 libjoda-time-java (2.1-2) unstable; urgency=low
 

Modified: trunk/libjoda-time-java/debian/control
===================================================================
--- trunk/libjoda-time-java/debian/control	2013-05-11 21:49:49 UTC (rev 16615)
+++ trunk/libjoda-time-java/debian/control	2013-05-13 14:23:24 UTC (rev 16616)
@@ -2,11 +2,13 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>,
+ Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: libmaven-antrun-plugin-java, libmaven-javadoc-plugin-java,
- junit, default-jdk-doc, ant, libclirr-maven-plugin-java, libjoda-convert-java
-Standards-Version: 3.9.3
+ junit, default-jdk-doc, ant, libclirr-maven-plugin-java, libjoda-convert-java,
+ libmaven-exec-plugin-java
+Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libjoda-time-java
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libjoda-time-java/
 Homepage: http://joda-time.sourceforge.net

Modified: trunk/libjoda-time-java/debian/maven.ignoreRules
===================================================================
--- trunk/libjoda-time-java/debian/maven.ignoreRules	2013-05-11 21:49:49 UTC (rev 16615)
+++ trunk/libjoda-time-java/debian/maven.ignoreRules	2013-05-13 14:23:24 UTC (rev 16616)
@@ -16,6 +16,7 @@
 
 org.apache.maven.plugins maven-assembly-plugin * * * *
 org.apache.maven.plugins maven-checkstyle-plugin * * * *
+org.apache.maven.plugins maven-deploy-plugin * * * *
 org.apache.maven.plugins maven-jxr-plugin * * * *
 org.apache.maven.plugins maven-project-info-reports-plugin * * * *
 org.apache.maven.plugins maven-repository-plugin * * * *

Modified: trunk/libjoda-time-java/debian/orig-tar.sh
===================================================================
--- trunk/libjoda-time-java/debian/orig-tar.sh	2013-05-11 21:49:49 UTC (rev 16615)
+++ trunk/libjoda-time-java/debian/orig-tar.sh	2013-05-13 14:23:24 UTC (rev 16616)
@@ -1,13 +1,15 @@
 #!/bin/sh -e
+# called by uscan with '--upstream-version' <version> <file>
 
 VERSION=$2
 TAR=../libjoda-time-java_$VERSION.orig.tar.gz
-DIR=libjoda-time-java-$VERSION
-TAG=$(echo "v${VERSION}00" | sed -e's,\.,_,g')
+DIR=joda-time-$VERSION
 
-svn export http://joda-time.svn.sourceforge.net/svnroot/joda-time/tags/${TAG} $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG
+# clean up the upstream tarball
+tar zxvf $3
+mv joda-time-$VERSION $DIR
+GZIP=--best tar -czf $TAR --exclude '*.jar' $DIR
+rm -rf $DIR
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then

Modified: trunk/libjoda-time-java/debian/watch
===================================================================
--- trunk/libjoda-time-java/debian/watch	2013-05-11 21:49:49 UTC (rev 16615)
+++ trunk/libjoda-time-java/debian/watch	2013-05-13 14:23:24 UTC (rev 16616)
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/joda-time/joda-time-([\d\.]+)-dist.tar.gz
+http://sf.net/joda-time/joda-time-([\d\.]+)-dist.tar.gz debian debian/orig-tar.sh