[taglibs-standard] 04/12: Updated debian/watch to track the releases >= 1.2

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository taglibs-standard.

commit 2ae8e23b3f1b0cec61edb749cd4ff577abe4f408
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 20 16:59:27 2016 +0200

    Updated debian/watch to track the releases >= 1.2
---
 debian/changelog   |  1 +
 debian/orig-tar.sh | 13 -------------
 debian/rules       |  2 +-
 debian/watch       |  2 +-
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3e29db..e657db6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ taglibs-standard (1.1.2-5) UNRELEASED; urgency=medium
   * Team upload.
   * Renamed the package to taglibs-standard
   * Standards-Version updated to 3.9.8
+  * Updated debian/watch to track the releases >= 1.2
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 20 Jul 2016 16:51:36 +0200
 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 7a3a959..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-DIR=jakarta-taglibs-standard-$2
-TAR=../jakarta-taglibs-standard_$2.orig.tar.gz
-
-# clean up the upstream tarball
-tar zxvf $3
-mv $DIR-src $DIR
-tar -c -z -f $TAR $DIR
-rm -rf $DIR
-
-exit 0
diff --git a/debian/rules b/debian/rules
index 9487ed2..8c7ebbf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ override_dh_auto_clean:
 	rm -Rf standard/build
 
 get-orig-source:
-	uscan --force-download --rename
+	uscan --download-current-version --force-download --rename --repack --compression xz
 
 get-orig-pom:
 	mkdir -p debian/poms
diff --git a/debian/watch b/debian/watch
index bbf957a..8ea4b77 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://archive.apache.org/dist/jakarta/taglibs/standard/source jakarta-taglibs-standard-(.*)-src.tar.gz debian debian/orig-tar.sh
+http://archive.apache.org/dist/tomcat/taglibs/taglibs-standard-(.*)/taglibs-standard-(.*)-source-release.zip

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