[pkg-java] r10737 - trunk/jakarta-jmeter/debian

[Sylvestre Ledru]

Author: sylvestre-guest
Date: 2009-10-02 13:35:19 +0000 (Fri, 02 Oct 2009)
New Revision: 10737

Added:
   trunk/jakarta-jmeter/debian/orig-tar.exclude
   trunk/jakarta-jmeter/debian/orig-tar.sh
Modified:
   trunk/jakarta-jmeter/debian/rules
   trunk/jakarta-jmeter/debian/watch
Log:
Better repack script

Added: trunk/jakarta-jmeter/debian/orig-tar.exclude
===================================================================
--- trunk/jakarta-jmeter/debian/orig-tar.exclude	                        (rev 0)
+++ trunk/jakarta-jmeter/debian/orig-tar.exclude	2009-10-02 13:35:19 UTC (rev 10737)
@@ -0,0 +1,2 @@
+*.jar
+

Added: trunk/jakarta-jmeter/debian/orig-tar.sh
===================================================================
--- trunk/jakarta-jmeter/debian/orig-tar.sh	                        (rev 0)
+++ trunk/jakarta-jmeter/debian/orig-tar.sh	2009-10-02 13:35:19 UTC (rev 10737)
@@ -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


Property changes on: trunk/jakarta-jmeter/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/jakarta-jmeter/debian/rules
===================================================================
--- trunk/jakarta-jmeter/debian/rules	2009-10-02 06:50:13 UTC (rev 10736)
+++ trunk/jakarta-jmeter/debian/rules	2009-10-02 13:35:19 UTC (rev 10737)
@@ -15,8 +15,4 @@
 	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

Modified: trunk/jakarta-jmeter/debian/watch
===================================================================
--- trunk/jakarta-jmeter/debian/watch	2009-10-02 06:50:13 UTC (rev 10736)
+++ trunk/jakarta-jmeter/debian/watch	2009-10-02 13:35:19 UTC (rev 10737)
@@ -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