[jenkins-dom4j] 03/05: 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-dom4j.

commit 4e859b2cd84b112a2f90f5071d0325412204c4c3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 4 19:46:45 2014 +0200

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

diff --git a/debian/changelog b/debian/changelog
index cf40bad..de4f043 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jenkins-dom4j (1.6.1-hudson-3-6) UNRELEASED; urgency=medium
 
   * Switch to debhelper level 9
   * Standards-Version updated to 3.9.5 (no changes)
+  * Use XZ compression for the upstream tarball
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 04 Sep 2014 19:19:33 +0200
 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 9d2e6b6..299fa3e 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,14 +1,21 @@
 #!/bin/sh -e
 
 VERSION=$2
-TAR=../jenkins-dom4j_$VERSION.orig.tar.gz
+TAR=../jenkins-dom4j_$VERSION.orig.tar.xz
 DIR=jenkins-dom4j-$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/java/org/dom4j/tree/ConcurrentReaderHashMap.java' $DIR
+XZ_OPT=--best tar -v -c -J -f $TAR \
+    --exclude '*.jar' \
+    --exclude '*.class' \
+    --exclude 'CVS' \
+    --exclude '.svn' \
+    --exclude 'src/java/org/dom4j/tree/ConcurrentReaderHashMap.java' \
+    $DIR
 rm -rf $DIR
 
diff --git a/debian/rules b/debian/rules
index 4f2dba0..2f772a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,5 +19,5 @@ clean::
 	mh_clean
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-current-version --force-download --rename
 

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