[guava-libraries] 02/04: Use the real upstream source downloaded from http://guava-libraries.googlecode.com/archive/v<VERSION>.zip instead of the sources jar from Maven central

[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 d5066834c29c69d16e3553f3e7233fa4ced9405f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Sep 11 11:44:58 2013 +0200

    Use the real upstream source downloaded from http://guava-libraries.googlecode.com/archive/v<VERSION>.zip instead of the sources jar from Maven central
---
 debian/changelog         |    3 +++
 debian/orig-tar.excludes |    3 ---
 debian/orig-tar.sh       |   22 +++++++++++++---------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a26040e..d5858e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ guava-libraries (14.0.1-2) UNRELEASED; urgency=low
 
   * debian/control: Use canonical URLs for the Vcs-* fields
   * Use XZ compression for the upstream tarball
+  * Use the real upstream source downloaded from
+    http://guava-libraries.googlecode.com/archive/v<VERSION>.zip
+    instead of the sources jar from Maven central
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 26 Jun 2013 19:17:42 +0200
 
diff --git a/debian/orig-tar.excludes b/debian/orig-tar.excludes
deleted file mode 100644
index 56be4ca..0000000
--- a/debian/orig-tar.excludes
+++ /dev/null
@@ -1,3 +0,0 @@
-guava-*/*.zip
-guava-*/*.jar
-guava-*/javadoc/*
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index eea6ccb..5a787f1 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -2,12 +2,16 @@
 
 VERSION=$2
 TAR=../guava-libraries_$VERSION.orig.tar.xz
-DIR=guava-r$VERSION
-
-mkdir -p $DIR/src/main/java
-(cd $DIR/src/main/java
-	jar xf ../../../../$3
-)
-XZ_OPT=--best tar -cJ --owner root --group root --mode a+rX \
-  --anchored -X debian/orig-tar.excludes -f $TAR $DIR
-rm -rf $DIR $3
+
+# 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-*

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