[tomcat8] 01/03: Changed debian/watch to match only the official releases

[Emmanuel Bourg]

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

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

commit 2b006ee0d6feac2e801a08aaf6b185707d5820a2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 30 20:27:16 2013 +0200

    Changed debian/watch to match only the official releases
---
 debian/orig-tar.sh |    2 +-
 debian/rules       |    2 +-
 debian/watch       |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 757fb2c..cb0087e 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -7,7 +7,7 @@ TAG=$(echo TOMCAT_$VERSION | sed -e 's/[\.~]/_/g')
 
 svn export http://svn.apache.org/repos/asf/tomcat/tags/$TAG $DIR
 tar -c -J -f $TAR --exclude 'standard.jar' --exclude 'jstl.jar' $DIR
-rm -rf $DIR ../$TAG
+rm -rf $DIR ../$TAG $3
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then
diff --git a/debian/rules b/debian/rules
index 4b2134e..79ca85c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,6 +131,6 @@ binary-arch: build install
 binary: binary-indep binary-arch
 
 get-orig-source:
-	-uscan --download-version $(T_VER) --force-download --rename
+	-uscan --force-download --rename
 
 .PHONY: build clean binary-indep binary-arch binary install get-orig-source
diff --git a/debian/watch b/debian/watch
index f5df205..5000846 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=uversionmangle=s/_/./g \
-  http://svn.apache.org/repos/asf/tomcat/tags/ TOMCAT_([0-9_]*[0123456789])/ debian debian/orig-tar.sh
+opts="uversionmangle=s/-(alpha|beta|RC)/~$1/" \
+ http://archive.apache.org/dist/tomcat/tomcat-8/v(.*)/src/apache-tomcat-(.*)-src.zip debian debian/orig-tar.sh

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