[guava-libraries] 03/03: Watch and download the releases from 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 guava-libraries.

commit c85e037da9e33ce2223eb25cab088f64e5794bac
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 17 23:59:08 2015 +0100

    Watch and download the releases from GitHub
---
 debian/changelog   |  1 +
 debian/orig-tar.sh | 17 -----------------
 debian/rules       |  2 +-
 debian/watch       |  3 +--
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da970cf..e4c0095 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ guava-libraries (18.0-5) UNRELEASED; urgency=medium
 
   * Build with the DH sequencer instead of CDBS
   * Updated the URL of the homepage
+  * Watch and download the releases from GitHub
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 17 Dec 2015 23:46:32 +0100
 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 5a787f1..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-VERSION=$2
-TAR=../guava-libraries_$VERSION.orig.tar.xz
-
-# delete the source jar downloaded by uscan
-rm $3
-
-# download and extract the real tarball
-wget http://guava-libraries.googlecode.com/archive/v$VERSION.zip -O guava-libraries-$VERSION.zip
-unzip guava-libraries-$VERSION.zip
-rm guava-libraries-$VERSION.zip
-
-# rebuild the tarball
-XZ_OPT='--best -v' tar -cJ --exclude '*.jar' -f $TAR guava-libraries-*
-
-rm -rf guava-libraries-*
diff --git a/debian/rules b/debian/rules
index 46be23a..2625f5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,4 @@ export JAVA_HOME = /usr/lib/jvm/default-java
 	dh $@ --buildsystem=maven
 
 get-orig-source:
-	-uscan --download-current-version --force-download --rename
+	-uscan --download-current-version --force-download --repack --compression xz
diff --git a/debian/watch b/debian/watch
index 5c06ade..cf2aa09 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
-opts=uversionmangle=s/r// \
- http://repo1.maven.org/maven2/com/google/guava/guava/([\d][\d\.]+)/guava-([\d\.]+)-sources.jar debian debian/orig-tar.sh
+https://github.com/google/guava/tags .*/v([\d\.]+).tar.gz

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