[med-svn] [diamond-aligner] 06/07: Do not parse d/changelog

[Andreas Tille]

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

tille pushed a commit to branch master
in repository diamond-aligner.

commit 608f5e6c1ac56794c03b2744fa6eccc8e41ca3d8
Author: Andreas Tille <tille at debian.org>
Date:   Mon Sep 18 14:51:16 2017 +0200

    Do not parse d/changelog
---
 debian/changelog |  1 +
 debian/rules     | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6f3bc84..d27faf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ diamond-aligner (0.9.10+dfsg-1) UNRELEASED; urgency=medium
   * Force the symbol with c++ explicit function template instantiation for the
     latter prototype instead of relying on implicit instantiation
   * Standards-Version: 4.1.0 (no changes needed)
+  * Do not parse d/changelog
 
  -- Andreas Tille <tille at debian.org>  Mon, 18 Sep 2017 13:34:51 +0200
 
diff --git a/debian/rules b/debian/rules
index ec55a35..cec9635 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8
 # for hardening you might like to uncomment this:
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+include /usr/share/dpkg/default.mk
 
 MSSSSE3=$(shell if [ `dpkg-architecture -qDEB_BUILD_ARCH` = 'amd64' ] ; then echo "-mssse3" ; fi)
 
@@ -16,15 +16,15 @@ MSSSSE3=$(shell if [ `dpkg-architecture -qDEB_BUILD_ARCH` = 'amd64' ] ; then ech
 override_dh_install:
 	dh_install
 	# due to a file name conflict diamond is moved out of the way
-	mkdir -p debian/$(DEBPKGNAME)/usr/lib/debian-med/bin/
-	mv debian/$(DEBPKGNAME)/usr/bin/diamond debian/$(DEBPKGNAME)/usr/lib/debian-med/bin/
+	mkdir -p debian/$(DEB_SOURCE)/gusr/lib/debian-med/bin/
+	mv debian/$(DEB_SOURCE)/gusr/bin/diamond debian/$(DEBPKGNAME)/usr/lib/debian-med/bin/
 
 override_dh_installman:
 	dh_installman
 	# due to a file name conflict diamond.1 is moved out of the way
-	mkdir -p debian/$(DEBPKGNAME)/usr/lib/debian-med/share/man/man1/
-	mv debian/$(DEBPKGNAME)/usr/share/man/man1/diamond.1 debian/$(DEBPKGNAME)/usr/lib/debian-med/share/man/man1/
-	gzip -9 debian/$(DEBPKGNAME)/usr/lib/debian-med/share/man/man1/diamond.1
+	mkdir -p debian/$(DEB_SOURCE)/gusr/lib/debian-med/share/man/man1/
+	mv debian/$(DEB_SOURCE)/gusr/share/man/man1/diamond.1 debian/$(DEBPKGNAME)/usr/lib/debian-med/share/man/man1/
+	gzip -9 debian/$(DEB_SOURCE)/gusr/lib/debian-med/share/man/man1/diamond.1
 
 override_dh_compress:
 	dh_compress --exclude=.pdf
@@ -32,7 +32,7 @@ override_dh_compress:
 override_dh_fixperms:
 	dh_fixperms
 	# strangely the manpage becomes executable ... hmmm
-	chmod -x debian/$(DEBPKGNAME)/usr/lib/debian-med/share/man/man1/*
+	chmod -x debian/$(DEB_SOURCE)/gusr/lib/debian-med/share/man/man1/*
 
 build_simple:
 	MSSSSE3=$(MSSSSE3) build_simple.sh

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