[mapcache] 01/03: Use pkg-info.mk variables instead of dpkg-parsechangelog output.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapcache.

commit 751deeaad15abceab4b9a5796a83ead9a7315168
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 27 15:15:06 2017 +0200

    Use pkg-info.mk variables instead of dpkg-parsechangelog output.
---
 debian/changelog | 6 ++++++
 debian/rules     | 9 ++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad4ef73..2c2247b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapcache (1.6.0-3) UNRELEASED; urgency=medium
+
+  * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 27 Sep 2017 15:14:48 +0200
+
 mapcache (1.6.0-2) unstable; urgency=medium
 
   * Update symbols for other architecture.
diff --git a/debian/rules b/debian/rules
index 61bd98a..fad2a5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,11 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS+=$(CPPFLAGS)
 CFLAGS+=$(LDFLAGS)
 
-MAPCACHE_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
-BUILD_DATE=$(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date -u "+%d %B %Y" -f -)
+include /usr/share/dpkg/pkg-info.mk
+
+UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
+
+BUILD_DATE=$(shell LC_ALL=C date -u "+%d %B %Y" -d "@$(SOURCE_DATE_EPOCH)")
 
 CMAKE_OPTS:= \
 		-DCMAKE_INSTALL_PREFIX=/usr \
@@ -97,5 +100,5 @@ override_dh_install:
 	dh_install --autodest --list-missing
 
 override_dh_makeshlibs:
-	dh_makeshlibs -- -c0 -v$(MAPCACHE_VERSION)
+	dh_makeshlibs -- -c0 -v$(UPSTREAM_VERSION)
 

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