[zookeeper] 05/10: Delete the non filtered upstream tarball after unpacking it

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository zookeeper.

commit 0bcb704970c61ae0586a1ee5228b4e27fa3dd001
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 26 12:01:34 2015 +0100

    Delete the non filtered upstream tarball after unpacking it
---
 debian/changelog   |  1 +
 debian/orig-tar.sh | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35e6e37..acf3783 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ zookeeper (3.4.6+dfsg-1) UNRELEASED; urgency=medium
     - Removed src/contrib/loggraph from the upstream tarball since it isn't used
       and is missing the source of a minimized JavaScript file (yui-min.js)
     - Use XZ compression for the upstream tarball
+    - Delete the non filtered upstream tarball after unpacking it
 
  -- James Page <james.page at ubuntu.com>  Tue, 25 Mar 2014 09:41:18 +0000
 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 724723b..48b5b93 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,16 +1,16 @@
 #!/bin/bash -e
 
 VERSION=$2
-TAR=../zookeeper_$VERSION.orig.tar.gz
-NEWTAR=../zookeeper_$VERSION+dfsg.orig.tar.xz
+TAR=../zookeeper_$VERSION+dfsg.orig.tar.xz
 DIR=zookeeper-$VERSION
-mkdir -p $DIR
 
 # Unpack ready fo re-packing
-tar -xzf $TAR -C $DIR --strip-components=1
+mkdir -p $DIR
+tar -xzf $3 -C $DIR --strip-components=1
+rm $3
 
 # Repack excluding stuff we don't need
-XZ_OPT=--best tar -cJf $NEWTAR \
+XZ_OPT=--best tar -cvJf $TAR \
          --exclude '*.jar' \
          --exclude "Makefile.in" \
          --exclude "aclocal.m4" \
@@ -31,4 +31,4 @@ XZ_OPT=--best tar -cJf $NEWTAR \
          --exclude "zookeeper-${VERSION}/src/java/generated" \
          $DIR
 
-rm -rf $DIR $TAR
+rm -rf $DIR

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