[libjfreechart-java] 02/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 libjfreechart-java.

commit 08a635a48b8d965eb3ecec1fa0ce2475e7b4102d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Aug 4 14:02:31 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 4018657..892e7bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libjfreechart-java (1.0.13-8.1) UNRELEASED; urgency=medium
   * Non-maintainer upload.
   * Moved the package to Git
   * Standards-Version updated to 3.9.8
+  * Use XZ compression for the upstream tarball
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 04 Aug 2016 13:33:51 +0200
 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 51ecd47..9875efe 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,21 +1,16 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
-DIR=libjfreechart-java-$2.orig
+PACKAGE=$(dpkg-parsechangelog -S Source)
+VERSION=$2
+DIR=${PACKAGE}-${VERSION}
+TAR=../${PACKAGE}_${VERSION}.orig.tar.xz
 
-echo "Cleaning up the original tarball"
-
-# clean up the upstream tarball
-tar zxf $3
-mv jfreechart-$2 $DIR
-GZIP=--best tar czf $3 --exclude '*jar' --exclude 'lib/*' $DIR
+mkdir $DIR
+tar -xf $3 --strip-components=1 -C $DIR
+rm $3
+XZ_OPT=--best tar -c -v -J -f $TAR \
+    --exclude '*jar' \
+    --exclude 'lib/*'\
+     $DIR
 rm -rf $DIR
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-    . .svn/deb-layout
-    mv $3 $origDir
-    echo "moved $3 to $origDir"
-fi
-
-exit 0
diff --git a/debian/rules b/debian/rules
index 8e32a00..e6a9388 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@ install/lib$(PACKAGE)-swt-java::
 	dh_link -plib$(PACKAGE)-swt-java /usr/share/java/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar /usr/share/java/jfreechart-swt.jar
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename
+	uscan --download-current-version --no-symlink
 
 get-orig-pom:
 	mkdir -p debian/poms

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