[xmlgraphics-commons] 20/47: Improve the download and creation of the orig tarball.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository xmlgraphics-commons.

commit a43856fa233467779c623cedd2d51bb6955b6c68
Author: Torsten Werner <twerner at debian.org>
Date:   Sun Jul 18 13:20:26 2010 +0000

    Improve the download and creation of the orig tarball.
---
 debian/changelog    |  6 +++++-
 debian/new-upstream | 16 +++++++---------
 debian/rules        |  2 +-
 debian/watch        |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 027183f..de775c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 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
 
diff --git a/debian/new-upstream b/debian/new-upstream
index b29b149..131cf97 100755
--- a/debian/new-upstream
+++ b/debian/new-upstream
@@ -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
diff --git a/debian/rules b/debian/rules
index 17e7673..03bc05f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,4 +20,4 @@ install/libxmlgraphics-commons-java::
 		-nxmlgraphics-commons -i${VERSION} build/xmlgraphics-commons-$(VERSION).jar
 
 get-orig-source:
-	uscan --force-download --verbose
+	uscan --force-download --verbose --rename
diff --git a/debian/watch b/debian/watch
index 400f9f9..e57cae5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/xmlgraphics-commons.git