[cube2font] 05/18: Rewrite get-orig-source using default dpkg variables

[Martin Werner]

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

arand-guest pushed a commit to branch master
in repository cube2font.

commit 2fb7cc68bd217999958396dc90852f8a9b0d2a7c
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Fri Apr 24 13:11:49 2015 +0200

    Rewrite get-orig-source using default dpkg variables
---
 debian/rules | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index c164bb7..37aeffd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,9 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
+
 %:
 	dh $@ --sourcedirectory=src --parallel
 
@@ -22,15 +25,12 @@ override_dh_auto_install:
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
-VER=$(shell dpkg-parsechangelog | sed -rne 's/^Version: ([^-]+).*/\1/p')
-DIR=cube2font-$(VER).orig
-UTAR=cube2font_$(VER).orig.tar.bz2
-TAR=cube2font_$(VER).orig.tar.xz
+DIR=cube2font-$(DEB_VERSION_UPSTREAM).orig
 get-orig-source:
 	uscan --noconf --force-download --download-current-version --destdir=.
 	rm -rf $(DIR)
-	tar -xf $(UTAR)
-	rm -f $(UTAR)
+	tar -xf cube2font_$(DEB_VERSION_UPSTREAM).orig.tar.bz2
+	rm -f cube2font_$(DEB_VERSION_UPSTREAM).orig.tar.bz2
 	mv redeclipse/ $(DIR)
 	find $(DIR) -mindepth 1 -not -name src \
 				-not -name shared \
@@ -45,5 +45,5 @@ get-orig-source:
 				-not -name redeclipse.cbp \
 				-delete
 	XZ="-6" tar --create --xz --owner root --group root --mode a+rX \
-                -f $(TAR) $(DIR)
+		-f cube2font_$(DEB_VERSION_UPSTREAM).orig.tar.xz $(DIR)
 	rm -rf $(DIR)

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