[dhewm3] 09/12: Use /usr/share/dpkg/pkg-info.mk instead of dpkg-parsechangelog

Tobias Frost tobi at moszumanska.debian.org
Tue Nov 28 19:40:04 UTC 2017


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

tobi pushed a commit to branch master
in repository dhewm3.

commit 0d3ff394b5425c3ed4199c5ca93eddd91b4b1970
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Tue Nov 28 19:46:48 2017 +0100

    Use /usr/share/dpkg/pkg-info.mk instead of dpkg-parsechangelog
---
 debian/changelog | 1 +
 debian/rules     | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1fe06e..6bf0e02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ dhewm3 (1.4.1+git20171102+dfsg-1) UNRELEASED; urgency=medium
     copyright format URL, as this is now allowed.
   * Update d/copyright years
   * Fix spelling error in README.Debian
+  * Use /usr/share/dpkg/pkg-info.mk instead of dpkg-parsechangelog
 
  -- Tobias Frost <tobi at debian.org>  Tue, 28 Nov 2017 18:31:52 +0100
 
diff --git a/debian/rules b/debian/rules
index fd84721..da8d608 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+
 # output every command that modifies files on the build system.
 #DH_VERBOSE = 1
 
@@ -20,10 +22,10 @@ override_dh_installdocs:
 # For get-orig-source
 UURL =  https://github.com/dhewm/dhewm3.git
 PKD   = $(abspath $(dir $(MAKEFILE_LIST)))
-PKG   = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
-VER  ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog  -SVersion | sed -e s/^.*git// -e s/+dfsg// | cut -d- -f1 )
+PKG   = $(DEB_SOURCE)
+VER   ?= $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e s/^.*git// -e s/+dfsg// | cut -d- -f1 )
 DTYPE = +dfsg
-UPSVER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | cut -d+ -f1)
+UPSVER  ?= $(shell echo $(DEB_VERSION_UPSTREAM) | cut -d+ -f1)
 
 ## from: https://wiki.debian.org/onlyjob/get-orig-source
 .PHONY: get-orig-source

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



More information about the Pkg-games-commits mailing list