[pkg-java] r10562 - trunk/tijmp/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2009-09-24 08:48:32 +0000 (Thu, 24 Sep 2009)
New Revision: 10562

Modified:
   trunk/tijmp/debian/rules
   trunk/tijmp/debian/watch
Log:
Changes the mangling rule in debian/watch.

Modified: trunk/tijmp/debian/rules
===================================================================
--- trunk/tijmp/debian/rules	2009-09-24 08:01:04 UTC (rev 10561)
+++ trunk/tijmp/debian/rules	2009-09-24 08:48:32 UTC (rev 10562)
@@ -21,12 +21,15 @@
 get-orig-source:
 	dh_testdir
 	which $(WGET) || (echo "Need wget to fetch some files."; exit 1)
+	test ! -d tijmp-$(UPSTREAM_VERSION) || rm -fr tijmp-$(UPSTREAM_VERSION)
 	test ! -d tijmp-$(DEB_UPSTREAM_VERSION) || rm -fr tijmp-$(DEB_UPSTREAM_VERSION)
-	test -d ../tijmp-$(DEB_UPSTREAM_VERSION) || uscan --force-download --rename
-	tar xzf ../tijmp_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+	uscan --force-download --rename
+	tar xzf ../tijmp_$(UPSTREAM_VERSION).orig.tar.gz
+	rm -f ../tijmp_$(UPSTREAM_VERSION).orig.tar.gz
 	cd tijmp-$(UPSTREAM_VERSION)/src/ && \
 	  rm java_crw_demo.* && \
 	  $(WGET) http://hg.openjdk.java.net/jdk7/jdk7/jdk/raw-file/37a05a11f281/src/share/demo/jvmti/java_crw_demo/java_crw_demo.h && \
 	  $(WGET) http://hg.openjdk.java.net/jdk7/jdk7/jdk/raw-file/37a05a11f281/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c
-	tar czf ../tijmp_$(DEB_UPSTREAM_VERSION).orig.tar.gz tijmp-$(UPSTREAM_VERSION)
-	rm -fr tijmp-$(UPSTREAM_VERSION)
+	mv tijmp-$(UPSTREAM_VERSION) tijmp-$(DEB_UPSTREAM_VERSION)
+	tar czf ../tijmp_$(DEB_UPSTREAM_VERSION).orig.tar.gz tijmp-$(DEB_UPSTREAM_VERSION)
+	rm -fr tijmp-$(DEB_UPSTREAM_VERSION)

Modified: trunk/tijmp/debian/watch
===================================================================
--- trunk/tijmp/debian/watch	2009-09-24 08:01:04 UTC (rev 10561)
+++ trunk/tijmp/debian/watch	2009-09-24 08:48:32 UTC (rev 10562)
@@ -1,3 +1,3 @@
 version=3
-opts=uversionmangle=s/-pre/~pre/,uversionmangle=s/$/\+dfsg/ \
+opts=uversionmangle=s/-pre/~pre/,dversionmangle=s/\+dfsg// \
 	http://www.khelekore.org/jmp/tijmp/ tijmp-(.*).tar.gz