[jsoup] 03/03: Replaced debian/get-orig-source with debian/orig-tar.sh called from uscan 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 jsoup.

commit 298708e4fc36ff41b53536c7c59fdc1efed697b7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 20 18:08:43 2013 +0100

    Replaced debian/get-orig-source with debian/orig-tar.sh called from uscan
    Use XZ compression for the upstream tarball
---
 debian/changelog         |    2 ++
 debian/get-orig-source   |   22 ----------------------
 debian/orig-tar.excludes |    8 ++++++++
 debian/orig-tar.sh       |   11 +++++++++++
 debian/watch             |    2 +-
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5496ad..01e26e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 jsoup (1.7.2-2) UNRELEASED; urgency=low
 
+  * Replaced debian/get-orig-source with debian/orig-tar.sh called from uscan
+  * Use XZ compression for the upstream tarball
   * Updated Standards-Version to 3.9.5 (no changes)
   * Switch to debhelper level 9
 
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index c523434..0000000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-set -e
-
-VERSION=1.7.2
-
-TARBALL=jsoup_${VERSION}.orig.tar
-
-FILES_TO_DELETE="jhy-jsoup-*/src/test/resources/htmltests/baidu-cn-home.html
-jsoup-jsoup-*/src/test/resources/htmltests/google-ipod.html
-jsoup-jsoup-*/src/test/resources/htmltests/news-com-au-home.html
-jsoup-jsoup-*/src/test/resources/htmltests/nyt-article-1.html
-jsoup-jsoup-*/src/test/resources/htmltests/smh-biz-article-1.html
-jsoup-jsoup-*/src/test/resources/htmltests/yahoo-article-1.html
-jsoup-jsoup-*/src/test/resources/htmltests/yahoo-jp.html
-"
-
-echo "Creating tarball '$TARBALL'..."
-
-uscan --download-version $VERSION --rename --verbose --force-download
-gunzip ../$TARBALL
-tar --delete --wildcards -f ../$TARBALL $FILES_TO_DELETE
-gzip ../$TARBALL
diff --git a/debian/orig-tar.excludes b/debian/orig-tar.excludes
new file mode 100644
index 0000000..76d2f00
--- /dev/null
+++ b/debian/orig-tar.excludes
@@ -0,0 +1,8 @@
+src/test/resources/htmltests/baidu-cn-home.html
+src/test/resources/htmltests/baidu-variant.html
+src/test/resources/htmltests/google-ipod.html
+src/test/resources/htmltests/news-com-au-home.html
+src/test/resources/htmltests/nyt-article-1.html
+src/test/resources/htmltests/smh-biz-article-1.html
+src/test/resources/htmltests/yahoo-article-1.html
+src/test/resources/htmltests/yahoo-jp.html
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..4ff16f2
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+VERSION=$2
+DIR=jsoup-jsoup-${VERSION}
+TAR=../jsoup_${VERSION}.orig.tar.xz
+
+tar -xf $3
+rm $3
+XZ_OPT=--best tar -c -v -J -f $TAR -X debian/orig-tar.excludes $DIR
+rm -Rf $DIR
diff --git a/debian/watch b/debian/watch
index 71f73c6..364f1b5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-https://github.com/jhy/jsoup/tags .*/jsoup-(.*)\.tar\.gz debian
+https://github.com/jhy/jsoup/tags .*/jsoup-(.*)\.tar\.gz debian debian/orig-tar.sh

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