[jenkins-winstone] 01/01: Use XZ compression for the upstream 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 jenkins-winstone.

commit 15b8ba354a26027dee0c1d66cbb7f1134b1ec706
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 5 14:00:12 2014 +0200

    Use XZ compression for the upstream tarball
---
 debian/changelog   |  7 +++++++
 debian/orig-tar.sh | 17 ++++++++++++-----
 debian/rules       |  6 +-----
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 30e159a..937e197 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jenkins-winstone (0.9.10-jenkins-47+dfsg-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Use XZ compression for the upstream tarball
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 05 Sep 2014 13:39:33 +0200
+
 jenkins-winstone (0.9.10-jenkins-47+dfsg-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index da8921d..67303c3 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,14 +1,21 @@
 #!/bin/sh -e
 
 VERSION=$2
-TAR=../jenkins-winstone_$VERSION.orig.tar.gz
+TAR=../jenkins-winstone_$VERSION.orig.tar.xz
 DIR=jenkins-winstone-$VERSION
 mkdir -p $DIR
+
 # Expand the upstream tarball
-tar -xzf $TAR -C $DIR --strip-components=1
+tar -xzf $3 -C $DIR --strip-components=1
+rm $3
+
 # Repack excluding stuff we don't need
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' \
-    --exclude 'CVS' --exclude '.svn' \
-	--exclude 'src/conf/javax' $DIR
+XZ_OPT=--best tar -c -J -v -f $TAR \
+    --exclude '*.jar' \
+    --exclude '*.class' \
+    --exclude 'CVS' \
+    --exclude '.svn' \
+    --exclude 'src/conf/javax' \
+    $DIR
 rm -rf $DIR
 
diff --git a/debian/rules b/debian/rules
index db8ea57..237e084 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,6 @@ JAVA_HOME := /usr/lib/jvm/default-java
 DEB_MAVEN_INSTALL_TO_USJ := false
 PACKAGE   := jenkins-winstone
 JAR       := winstone
-# Parse upstream version without +dfsg for source download+
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
 
 # Run mh_installjar to ensure USJ name matches package
 # and does not conflict with any pure winstone packaged
@@ -20,6 +18,4 @@ install/lib$(PACKAGE)-java::
 	jh_classpath -plib$(PACKAGE)-java
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-	mv ../$(PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
-		../$(PACKAGE)_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.gz
+	uscan --download-current-version --force-download --rename

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