[guice] 01/01: Watch 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 guice.

commit a28dd2560a332dfa940d5520013421476fe4cb2a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 16 20:06:49 2014 +0200

    Watch the release tags on Github
---
 debian/changelog        |  8 ++++++++
 debian/orig-tar.exclude | 47 -----------------------------------------------
 debian/orig-tar.sh      | 11 ++++++-----
 debian/watch            |  5 ++---
 4 files changed, 16 insertions(+), 55 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c22fd9..a5fc6b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+guice (3.0-7) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Use XZ compression for the upstream tarball
+  * debian/watch: Watch the release tags on Github
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 16 Oct 2014 20:05:43 +0200
+
 guice (3.0-6) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
deleted file mode 100644
index 9fb8473..0000000
--- a/debian/orig-tar.exclude
+++ /dev/null
@@ -1,47 +0,0 @@
-javadoc/*
-
-extensions/assistedinject/build/classes/com/google/inject/assistedinject/*.class
-extensions/grapher/build/classes/com/google/inject/grapher/*.class
-extensions/grapher/build/classes/com/google/inject/grapher/graphviz/*.class
-extensions/jmx/build/classes/com/google/inject/tools/jmx/*.class
-extensions/jndi/build/classes/com/google/inject/jndi/*.class
-extensions/multibindings/build/classes/com/google/inject/multibindings/*.class
-extensions/persist/build/classes/com/google/inject/persist/*.class
-extensions/persist/build/classes/com/google/inject/persist/finder/*.class
-extensions/persist/build/classes/com/google/inject/persist/jpa/*.class
-extensions/servlet/build/classes/com/google/inject/servlet/*.class
-extensions/spring/build/classes/com/google/inject/spring/*.class
-extensions/struts2/build/classes/com/google/inject/struts2/*.class
-extensions/throwingproviders/build/classes/com/google/inject/throwingproviders/*.class
-
-extensions/assistedinject/build/*.bar
-extensions/grapher/build/*.bar
-extensions/jmx/build/*.bar
-extensions/jndi/build/*.bar
-extensions/multibindings/build/*.bar
-extensions/persist/build/*.bar
-extensions/servlet/build/*.bar
-extensions/spring/build/*.bar
-extensions/struts2/build/*.bar
-extensions/throwingproviders/build/*.bar
-
-extensions/assistedinject/build/*.jar
-extensions/grapher/build/*.jar
-extensions/jmx/build/*.jar
-extensions/jndi/build/*.jar
-extensions/multibindings/build/*.jar
-extensions/persist/build/*.jar
-extensions/persist/lib/*.jar
-extensions/servlet/build/*.jar
-extensions/servlet/lib/build/*.jar
-extensions/spring/build/*.jar
-extensions/struts2/build/*.jar
-extensions/struts2/lib/*.jar
-extensions/throwingproviders/build/*.jar
-lib/*.jar
-lib/build/*.jar
-lib/build/jdiff/*.jar
-
-*.ipr
-*.iml
-
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 7110541..cb2a720 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -3,11 +3,12 @@
 set -e
 
 # called by uscan with '--upstream-version' <version> <file>
-DIR=guice-$2
-TAR=guice_$2.orig.tar.xz
+VERSION=$2
+TAR=../guice_$VERSION.orig.tar.xz
+DIR=guice-$VERSION
 
 # Repack upstream source to tar.xz
-unzip $3
-mv guice-$2-src $DIR
-XZ_OPT=--best tar cJf $TAR -X debian/orig-tar.exclude $DIR
+mkdir $DIR
+tar -xf $3 --strip-components=1 --directory $DIR
+XZ_OPT=--best tar cvJf $TAR --exclude '*.jar' --exclude '*.iml' --exclude '*.ipr' --exclude '*.class' --exclude='.travis.yml' $DIR
 rm -rf $DIR $3
diff --git a/debian/watch b/debian/watch
index b68d1ae..bb460eb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-http://code.google.com/p/google-guice/downloads/list \
- //google-guice.googlecode.com/files/guice-([0-9\.]+)-src.zip \
- debian debian/orig-tar.sh
+opts=uversionmangle=s/-(rc|beta)/~$1/ \
+https://github.com/google/guice/tags .*/([\d\.]+(?:-(?:rc|beta)\d+)?).tar.gz debian debian/orig-tar.sh

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