[SCM] jack-tools/master: Reuse CDBS resolved variables in local get-orig-tar target.

js at users.alioth.debian.org js at users.alioth.debian.org
Mon Jan 3 05:55:40 UTC 2011


The following commit has been merged in the master branch:
commit e5c95950e7945384a813163b105d930f098f3e9c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jan 3 04:46:52 2011 +0100

    Reuse CDBS resolved variables in local get-orig-tar target.

diff --git a/debian/rules b/debian/rules
index bad0107..93a40d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,5 @@
 #!/usr/bin/make -f
 
-PACKAGE = jack-tools
-SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-\(.*\)/\3/p')
-TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz
-
 DEB_AUTO_UPDATE_LIBTOOL = pre
 DEB_AUTO_UPDATE_ACLOCAL = 1.10
 DEB_AUTO_UPDATE_AUTOCONF = 2.60
@@ -38,11 +34,12 @@ build/jack-tools::
 clean::
 	rm -f *.1
 
+TARBALL = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
 get-orig-source:
 	rm -rf get-orig-source $(TARBALL)
 	mkdir get-orig-source
-	darcs get http://www.slavepianos.org/rd/sw/jack.* get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig
-	rm -rf get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig/_darcs
-	GZIP='--best --no-name' tar czf $(TARBALL) -C get-orig-source $(PACKAGE)-$(SRC_VERSION).orig
+	darcs get http://www.slavepianos.org/rd/sw/jack.* get-orig-source/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig
+	rm -rf get-orig-source/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig/_darcs
+	GZIP='--best --no-name' tar czf $(TARBALL) -C get-orig-source $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig
 	rm -rf get-orig-source
 	echo "  "$(TARBALL)" created; now git-import-orig and remove it again."

-- 
jack-tools packaging



More information about the pkg-multimedia-commits mailing list