[jakarta-jmeter] 07/60: Better repack script

[Emmanuel Bourg]

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

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

commit ba14db4878fcbb059117501992150119c51ef85a
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Fri Oct 2 13:35:19 2009 +0000

    Better repack script
---
 debian/orig-tar.exclude |  2 ++
 debian/orig-tar.sh      | 19 +++++++++++++++++++
 debian/rules            |  6 +-----
 debian/watch            |  4 ++--
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
new file mode 100644
index 0000000..c43b701
--- /dev/null
+++ b/debian/orig-tar.exclude
@@ -0,0 +1,2 @@
+*.jar
+
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..0976dba
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=jakarta-jmeter-$2
+TAR=../jakarta-jmeter_$2.orig.tar.gz
+
+# clean up the upstream tarball
+tar zxvf $3
+tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+    . .svn/deb-layout
+    mv $TAR $origDir
+    echo "moved $TAR to $origDir"
+fi
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 07e666e..fcdd7dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,4 @@ install/jmeter::
 	install -m 755 bin/jmeter-server debian/jmeter/usr/share/jmeter/bin
 
 get-orig-source:
-	cd .. && wget -c http://www.apache.org/dist/jakarta/jmeter/source/jakarta-jmeter-$(DEB_UPSTREAM_VERSION)_src.tgz
-	tar -zxvf ../jakarta-jmeter-$(DEB_UPSTREAM_VERSION)_src.tgz
-	tar -zcv --exclude *.jar \
-	    -f ../jakarta-jmeter_$(DEB_UPSTREAM_VERSION).orig.tar.gz jakarta-jmeter-$(DEB_UPSTREAM_VERSION)/
-	rm -rf jakarta-jmeter-$(DEB_UPSTREAM_VERSION)
+	uscan --force-download --rename
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
index 0474b6d..2fcd071 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=2
-http://www.apache.org/dist/jakarta/jmeter/source/jakarta-jmeter-([\d\.]+)_src\.tgz
+version=3
+http://www.apache.org/dist/jakarta/jmeter/source/jakarta-jmeter-([\d\.]+)_src\.tgz debian debian/orig-tar.sh

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