[rocksndiamonds] 04/06: Avoid dpkg-parsechangelog

Stephen Kitt skitt at moszumanska.debian.org
Wed Jul 26 21:15:48 UTC 2017


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

skitt pushed a commit to branch master
in repository rocksndiamonds.

commit 4f5e9924120fa7a4a8946c9167466f591d01cff9
Author: Stephen Kitt <skitt at debian.org>
Date:   Wed Jul 26 22:45:33 2017 +0200

    Avoid dpkg-parsechangelog
---
 debian/changelog |  2 ++
 debian/rules     | 14 ++++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d371cd..d8dba1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ rocksndiamonds (4.0.0.2+dfsg-2) UNRELEASED; urgency=medium
   * Upload to unstable.
   * Update debian/copyright.
   * Standards-Version 4.0.0, no further change required.
+  * Rely on pkg-info.mk instead of running dpkg-parsechangelog to
+    determine the version.
 
  -- Stephen Kitt <skitt at debian.org>  Thu, 20 Jul 2017 23:05:04 +0200
 
diff --git a/debian/rules b/debian/rules
index 388e06f..4425f39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,10 @@
 #!/usr/bin/make -f
 
-
-VERSION			:=	$(shell dpkg-parsechangelog \
-				|grep ^Version \
-				|awk '{print $$2}' \
-				|sed 's/-[0-9]\+$$//')
-
-UPSTREAM_VERSION	:=	$(shell echo $(VERSION)|sed 's/+.*//')
-
-LEVEL_DIR		:=	/usr/share/games/rocksndiamonds
-
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/dpkg/pkg-info.mk
+
+UPSTREAM_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/+.*//')
+LEVEL_DIR := /usr/share/games/rocksndiamonds
 
 build/rocksndiamonds::
 	make RO_GAME_DIR=$(LEVEL_DIR) sdl2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git



More information about the Pkg-games-commits mailing list