[med-svn] [last-align] 07/08: do not parse changelog

[Andreas Tille]

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

tille pushed a commit to branch master
in repository last-align.

commit ea818b3caeb0eb9600c22d343ecbba948176f6b0
Author: Andreas Tille <tille at debian.org>
Date:   Mon Feb 5 10:39:18 2018 +0100

    do not parse changelog
---
 debian/changelog |  1 +
 debian/rules     | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b2aa52c..47a198a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ last-align (921-1) UNRELEASED; urgency=medium
     Closes: #889506
   * cme fix dpkg-control
   * debhelper 11
+  * d/rules: do not parse changelog
 
  -- Andreas Tille <tille at debian.org>  Mon, 05 Feb 2018 10:29:19 +0100
 
diff --git a/debian/rules b/debian/rules
index fc925a3..aee1941 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,9 @@
 # 
 # https://debian-med.alioth.debian.org/docs/policy.html
 
-pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
-version=$(shell dpkg-parsechangelog -ldebian/changelog | grep Version: | cut -f2 -d' ' | cut -f1 -d- )
-mandir=$(CURDIR)/debian/$(pkg)/usr/share/man/man1/
+include /usr/share/dpkg/default.mk
+
+mandir=$(CURDIR)/debian/$(DEB_SOURCE)/usr/share/man/man1/
 
 # Copy upstream CXXFLAGS here because makefile enables only overriding them
 CXXFLAGS += -Wall -Wextra -Wcast-qual -Wswitch-enum -Wundef -Wcast-align -Wno-long-long -ansi -pedantic -std=c++11
@@ -26,10 +26,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 override_dh_auto_build:
 	make all CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
 
-HELP2MAN = help2man --no-info --version-string="$(version)"
+HELP2MAN = help2man --no-info --version-string="$(DEB_VERSION_UPSTREAM)"
 
 override_dh_auto_install:
-	make install prefix=$(CURDIR)/debian/$(pkg)/usr
+	make install prefix=$(CURDIR)/debian/$(DEB_SOURCE)/usr
 
 override_dh_installman:
 	dh_installman

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/last-align.git