[pkg-java] r12777 - trunk/xmlgraphics-commons/debian

[Torsten Werner]

Author: twerner
Date: 2010-07-18 13:20:26 +0000 (Sun, 18 Jul 2010)
New Revision: 12777

Modified:
   trunk/xmlgraphics-commons/debian/changelog
   trunk/xmlgraphics-commons/debian/new-upstream
   trunk/xmlgraphics-commons/debian/rules
   trunk/xmlgraphics-commons/debian/watch
Log:
Improve the download and creation of the orig tarball.

Modified: trunk/xmlgraphics-commons/debian/changelog
===================================================================
--- trunk/xmlgraphics-commons/debian/changelog	2010-07-18 12:53:08 UTC (rev 12776)
+++ trunk/xmlgraphics-commons/debian/changelog	2010-07-18 13:20:26 UTC (rev 12777)
@@ -1,12 +1,16 @@
 xmlgraphics-commons (1.4.dfsg-1) experimental; urgency=low
 
+  [ Mathieu Malaterre ]
   * New upstream. Closes: #589269
   * Update Standards-Version to 3.9.0 (no change required)
   * Use shipped in pom.xml instead of debian one.
   * Add get-orig-source target in debian/rules
 
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Fri, 16 Jul 2010 11:39:47 +0200
+  [ Torsten Werner ]
+  * Improve the download and creation of the orig tarball.
 
+ -- Torsten Werner <twerner at debian.org>  Sun, 18 Jul 2010 15:19:45 +0200
+
 xmlgraphics-commons (1.3.1.dfsg-5) unstable; urgency=low
 
   * Added Maven support

Modified: trunk/xmlgraphics-commons/debian/new-upstream
===================================================================
--- trunk/xmlgraphics-commons/debian/new-upstream	2010-07-18 12:53:08 UTC (rev 12776)
+++ trunk/xmlgraphics-commons/debian/new-upstream	2010-07-18 13:20:26 UTC (rev 12777)
@@ -13,20 +13,18 @@
 #
 # Thanks to Sam Morris <sam at robots.org.uk> for giving me the idea
 
+set -e
+
 version=$2
 filename=$3
 
-dir=`mktemp -d`
+dir=xmlgraphics-commons-*
 
-
 # We repackage the upstream tarball, removing the jars in the library and
 # the examples, which have dubious copyright status
-tar xvzf $filename -C "$dir" --exclude '*/lib/*.jar'  --exclude '*/examples'
-origname=xmlgraphics-commons_$version.dfsg.orig.tar.gz
+tar xzf $filename --exclude '*/lib/*.jar'
 
 # We repackage excluding the lib/ subdir
-cd $dir
-tar cvz -f $origname xml*
-cd -
-mv $dir/$origname ..
-rm -rf $dir
\ No newline at end of file
+tar cz -f $filename xml*
+
+rm -rf $dir

Modified: trunk/xmlgraphics-commons/debian/rules
===================================================================
--- trunk/xmlgraphics-commons/debian/rules	2010-07-18 12:53:08 UTC (rev 12776)
+++ trunk/xmlgraphics-commons/debian/rules	2010-07-18 13:20:26 UTC (rev 12777)
@@ -20,4 +20,4 @@
 		-nxmlgraphics-commons -i${VERSION} build/xmlgraphics-commons-$(VERSION).jar
 
 get-orig-source:
-	uscan --force-download --verbose
+	uscan --force-download --verbose --rename

Modified: trunk/xmlgraphics-commons/debian/watch
===================================================================
--- trunk/xmlgraphics-commons/debian/watch	2010-07-18 12:53:08 UTC (rev 12776)
+++ trunk/xmlgraphics-commons/debian/watch	2010-07-18 13:20:26 UTC (rev 12777)
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\.dfsg(\+dak)?$// \
+opts=uversionmangle=s/$/.dfsg/ \
   http://www.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-(.*)-src\.tar\.gz debian debian/new-upstream