[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.5+dfsg1-2-5-g1545dde

[James Page]

The following commit has been merged in the master branch:
commit b2fbdf6adc47f5d1ad96b8395100f80f773001f1
Author: James Page <james.page at ubuntu.com>
Date:   Tue Aug 7 15:15:28 2012 +0100

    d/{orig-tar.sh,watch,README.source}: Repack upstream tarball when downloading using uscan.

diff --git a/debian/README.source b/debian/README.source
index 6a0fd40..48b77fc 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,28 +1,3 @@
-Upstream tarball
-----------------
-
-The command used to filter and import the upstream tarball was:
-
-VERSION=3.3.4
-git-import-orig --pristine-tar --filter-pristine-tar --no-merge --upstream-version=$VERSION+dfsg1 \
-                --filter="*.jar" \
-                --filter="Makefile.in" \
-                --filter="aclocal.m4" \
-                --filter="autom4te.cache" \
-                --filter="compile" \
-                --filter="config.guess" \
-                --filter="config.sub" \
-                --filter="configure" \
-                --filter="ltmain.sh" \
-                --filter="zookeeper-$VERSION/contrib" \
-                --filter="zookeeper-$VERSION/docs" \
-                --filter="zookeeper-$VERSION/recipes" \
-                --filter="zookeeper-$VERSION/dist-maven" \
-                --filter="zookeeper-$VERSION/src/contrib/fatjar" \
-                --filter="zookeeper-$VERSION/src/c/generated" \
-                --filter="zookeeper-$VERSION/src/java/main/org/apache/jute/compiler/generated/*.java" \
-                --filter="zookeeper-$VERSION/src/java/generated" <tarball>
-
 RESTful support
 ---------------
 
diff --git a/debian/changelog b/debian/changelog
index b609625..3094432 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+zookeeper (3.3.5+dfsg1-2ubuntu1) UNRELEASED; urgency=low
+
+  * d/{orig-tar.sh,watch,README.source}: Repack upstream tarball when
+    downloading using uscan.
+
+ -- James Page <james.page at ubuntu.com>  Tue, 07 Aug 2012 15:14:43 +0100
+
 zookeeper (3.3.5+dfsg1-2) unstable; urgency=low
 
   * d/patches/fixes/ZOOKEEPER-1431: Fix up memory leak in zookeeper
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..614019b
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,32 @@
+#!/bin/bash -e
+
+VERSION=$2
+TAR=../zookeeper_$VERSION.orig.tar.gz
+NEWTAR=../zookeeper_$VERSION+dfsg.orig.tar.bz2
+DIR=zookeeper-$VERSION
+mkdir -p $DIR
+
+# Unpack ready fo re-packing
+tar -xzf $TAR -C $DIR --strip-components=1
+
+# Repack excluding stuff we don't need
+GZIP=--best tar -cjf $NEWTAR --exclude '*.jar' \
+         --exclude "Makefile.in" \
+         --exclude "aclocal.m4" \
+         --exclude "autom4te.cache" \
+         --exclude "compile" \
+         --exclude "config.guess" \
+         --exclude "config.sub" \
+         --exclude "configure" \
+         --exclude "ltmain.sh" \
+         --exclude "contrib" \
+         --exclude "docs" \
+         --exclude "recipes" \
+         --exclude "dist-maven" \
+         --exclude "src/contrib/fatjar" \
+         --exclude "src/c/generated" \
+         --exclude "src/java/main/org/apache/jute/compiler/generated/*.java" \
+         --exclude "src/java/generated" $DIR
+
+rm -rf $DIR $TAR
+
diff --git a/debian/watch b/debian/watch
index 1ea1a0e..c3d08ad 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
 opts=dversionmangle=s/\+dfsg\d+$// \
-  http://www.apache.org/dist/zookeeper/stable/zookeeper-([0-9.]+).tar.gz \
-  debian
+  http://mirrors.enquira.co.uk/apache/zookeeper/stable/zookeeper-([0-9.]+).tar.gz \
+  debian debian/orig-tar.sh

-- 
Apache ZooKeeper