[rome] 03/07: Fixed the watch file

[Emmanuel Bourg]

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

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

commit 661517b433ead787ef6e52ce818e0313e74754ec
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 23 23:01:32 2017 +0100

    Fixed the watch file
---
 debian/changelog   |  1 +
 debian/orig-tar.sh | 18 ------------------
 debian/rules       |  7 +------
 debian/watch       |  3 ++-
 4 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21cc524..ac7ee30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ rome (1.0-7) UNRELEASED; urgency=medium
   * Update copyright info.
 
   [ Emmanuel Bourg ]
+  * Fixed the watch file
   * Standards-Version updated to 4.1.1
 
  -- Miguel Landaeta <nomadium at debian.org>  Wed, 09 Aug 2017 21:45:11 +0100
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index a47bf33..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh 
-
-set -e
-
-# called by uscan with '--upstream-version' <version> <file>
-echo "version $2"
-package=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
-version=$2
-tarball=$3
-TAR=${package}_${version}.orig.tar.gz
-DIR=${package}-${version}.orig
-
-unzip $tarball -d $DIR
-
-GZIP=--best tar --numeric --group 0 --owner 0 -c -v -z -f $TAR \
-    --exclude 'META-INF' $DIR
-
-rm -rf $tarball $DIR
diff --git a/debian/rules b/debian/rules
index c9f3e88..b300de3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,4 @@ override_jh_clean:
 
 get-orig-source:
 	cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
-	uscan \
-		--verbose \
-		--no-symlink \
-		--destdir $(CURDIR)      \
-		--watchfile debian/watch \
-		--force-download
+	uscan --download-current-version --force-download --rename --destdir $(CURDIR)
diff --git a/debian/watch b/debian/watch
index 1c10d04..91b1df8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-https://github.com/rometools/rome/releases .*/rome-([\d\.]+).tar.gz debian debian/orig-tar.sh
+opts=mode=git,repack,compression=xz \
+https://github.com/rometools/rome refs/tags/v?([\d\.]+)

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