[shiro] 03/08: debian/watch: Track the release tags on GitHub

[Emmanuel Bourg]

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

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

commit e1cf2c5987908d4e99a049909f31ea6ac4563d68
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 16 15:14:29 2016 +0100

    debian/watch: Track the release tags on GitHub
---
 debian/changelog   |  1 +
 debian/orig-tar.sh | 20 --------------------
 debian/rules       |  2 +-
 debian/watch       |  3 +--
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a0a1a6..3dac84c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ shiro (1.2.5-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Depend on libtaglibs-standard-spec-java instead of libjstl1.1-java
+  * debian/watch: Track the release tags on GitHub
   * Switch to debhelper level 10
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 16 Nov 2016 14:57:43 +0100
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 50e7132..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -e
-#
-# Removes unwanted content from the upstream sources.
-# Called by uscan with '--upstream-version' <version> <file>
-#
-
-VERSION=$2
-TAR=../shiro_$VERSION.orig.tar.xz
-DIR=shiro-$VERSION
-TAG=$(echo "shiro-root-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-
-svn export http://svn.apache.org/repos/asf/shiro/tags/${TAG}/ $DIR
-XZ_OPT=--best tar -c -J -f $TAR --exclude '*.jar' --exclude '*.class' --exclude '.gitignore' $DIR
-rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir && echo "moved $TAR to $origDir"
-fi
diff --git a/debian/rules b/debian/rules
index c679e9c..a4fc7da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,4 +7,4 @@ override_dh_installchangelogs:
 	dh_installchangelogs -- RELEASE-NOTES
 
 get-orig-source:
-	uscan --download-current-version --force-download --no-symlink
+	uscan --download-current-version --force-download --rename --repack --compression xz
diff --git a/debian/watch b/debian/watch
index a887f57..adc9391 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
-opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
-  http://svn.apache.org/repos/asf/shiro/tags/ shiro-root-([\d\.]+)/ debian debian/orig-tar.sh
+https://github.com/apache/shiro/tags .*/shiro-root-([\d\.]+).tar.gz

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