[jsoup] 05/08: Removed debian/orig-tar.* and use the Files-Excluded mechanism

[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 1a8c707b63b5d979b137774c3413bb9f5bf27471
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Apr 17 22:46:27 2016 +0200

    Removed debian/orig-tar.* and use the Files-Excluded mechanism
---
 debian/changelog         |  1 +
 debian/copyright         |  8 ++++++++
 debian/orig-tar.excludes |  8 --------
 debian/orig-tar.sh       | 11 -----------
 debian/rules             |  2 +-
 debian/watch             |  2 +-
 6 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 010c4e5..18e07cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ jsoup (1.8.3-2) UNRELEASED; urgency=medium
   * Standards-Version updated to 3.9.8 (no changes)
   * Use secure Vcs-* fields
   * debian/watch: mangle the upstream version to remove the letter suffix
+  * Removed debian/orig-tar.* and use the Files-Excluded mechanism
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 17 Apr 2016 22:32:37 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 99ef694..ca0a7b2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,14 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: jsoup
 Upstream-Contact: Jonathan Hedley <jonathan at hedley.net> as Lead Developer
 Source: http://jsoup.org
+Files-Excluded: 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
 
 Files: *
 Copyright: 2009-2011, Jonathan Hedley
diff --git a/debian/orig-tar.excludes b/debian/orig-tar.excludes
deleted file mode 100644
index 76d2f00..0000000
--- a/debian/orig-tar.excludes
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100755
index 4ff16f2..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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/rules b/debian/rules
index d755df6..9e49cc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,4 @@
 	dh $@ --buildsystem=maven
 
 get-orig-source:
-	uscan --download-current-version --force-download --rename
+	uscan --download-current-version --force-download --rename --repack --compression xz
diff --git a/debian/watch b/debian/watch
index c9cc813..6ad1155 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 options=uversionmangle=s/([\d\.]+).*/$1/ \
-https://github.com/jhy/jsoup/tags .*/jsoup-(.*)\.tar\.gz debian debian/orig-tar.sh
+https://github.com/jhy/jsoup/tags .*/jsoup-(.*)\.tar\.gz

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