[SCM] guava-libraries: suite of Google Common Libraries for Java 5.0 branch, master, updated. debian/09-2-5-gb6bf6eb

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 8b32e7e5b421a85c8d7b76e2c6dce6030bd46836
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Wed Feb 22 23:03:10 2012 +0100

    New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 004bde0..ab090d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+guava-libraries (11.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 22 Feb 2012 22:54:31 +0100
+
 guava-libraries (09-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 9455ff5..fe2930c 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -4,9 +4,10 @@ VERSION=$2
 TAR=../guava-libraries_$VERSION.orig.tar.gz
 DIR=guava-r$VERSION
 
-unzip $3
 mkdir -p $DIR/src/main/java
-unzip $DIR/guava-src-r$VERSION.zip -d $DIR/src/main/java
+(cd $DIR/src/main/java
+	jar xf ../../../../$3
+)
 GZIP=--best tar -cz --owner root --group root --mode a+rX \
   --anchored -X debian/orig-tar.excludes -f $TAR $DIR
 rm -rf $DIR $3
diff --git a/debian/watch b/debian/watch
index a68c14d..5c06ade 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
 opts=uversionmangle=s/r// \
- http://code.google.com/p/guava-libraries/downloads/list .*/guava-([[:alnum:].-]+)\.zip \
- debian debian/orig-tar.sh
+ http://repo1.maven.org/maven2/com/google/guava/guava/([\d][\d\.]+)/guava-([\d\.]+)-sources.jar debian debian/orig-tar.sh

-- 
guava-libraries: suite of Google Common Libraries for Java 5.0