[pkg-java] r17306 - trunk/jmagick/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-10-07 09:33:25 +0000 (Mon, 07 Oct 2013)
New Revision: 17306

Modified:
   trunk/jmagick/debian/orig-tar.sh
   trunk/jmagick/debian/rules
Log:
Use XZ compression for the upstream tarball (follow up)



Modified: trunk/jmagick/debian/orig-tar.sh
===================================================================
--- trunk/jmagick/debian/orig-tar.sh	2013-10-07 09:01:02 UTC (rev 17305)
+++ trunk/jmagick/debian/orig-tar.sh	2013-10-07 09:33:25 UTC (rev 17306)
@@ -1,16 +1,15 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
-UPSTREAM_TAR=../jmagick-$2-src.tar.xz
-DIR=jmagick-$2.orig
+VERSION=$2
+TAR=../jmagick_$VERSION.orig.tar.xz
+DIR=jmagick-$VERSION.orig
 
-rm -f $3
-
 # clean up the upstream tarball
-tar zxf $UPSTREAM_TAR
-mv $2 $DIR
-XZ_OPT=--best tar cJf $3 -X debian/orig-tar.exclude $DIR
-rm -rf $DIR $UPSTREAM_TAR
+tar zxf $3
+mv $VERSION $DIR
+XZ_OPT=--best tar cJf $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR $3
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then

Modified: trunk/jmagick/debian/rules
===================================================================
--- trunk/jmagick/debian/rules	2013-10-07 09:01:02 UTC (rev 17305)
+++ trunk/jmagick/debian/rules	2013-10-07 09:33:25 UTC (rev 17306)
@@ -37,4 +37,4 @@
 
 .PHONY: get-orig-source
 get-orig-source:
-	uscan --upstream-version 0
+	uscan --upstream-version 0 --force-download --rename