[libcitygml] 03/05: 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 libcitygml.

commit dbc318ceeb476754c694aca67c1c0937440663f3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 18 22:28:18 2017 +0200

    Use pkg-info.mk variables instead of dpkg-parsechangelog output.
---
 debian/changelog | 1 +
 debian/rules     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9fa4084..6291255 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libcitygml (2.0.4-1~exp3) UNRELEASED; urgency=medium
   * Team upload.
   * Bump Standards-Version to 4.0.0, no changes.
   * Add autopkgtest to test installability.
+  * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 18 Jun 2017 22:14:18 +0200
 
diff --git a/debian/rules b/debian/rules
index 17399e1..cc915c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,14 @@
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+include /usr/share/dpkg/pkg-info.mk
+
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CFLAGS   += $(CPPFLAGS)
 CXXFLAGS += $(CPPFLAGS)
 
-CITYGML_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
+CITYGML_VERSION=$(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
 
 %:
 	dh $@ --with pkgkde_symbolshelper

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