[med-svn] [jellyfish] 04/06: Do not parse debian/changelog

[Andreas Tille]

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

tille pushed a commit to branch master
in repository jellyfish.

commit 7e4d298dda49810f15101a3230102341bdf5f6cd
Author: Andreas Tille <tille at debian.org>
Date:   Mon Aug 28 14:37:58 2017 +0200

    Do not parse debian/changelog
---
 debian/changelog | 1 +
 debian/rules     | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d05c19e..2700229 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ jellyfish (2.2.6-4) UNRELEASED; urgency=medium
     Chris Lamb <lamby at debian.org> for the fix)
     Closes: #863015
   * Autoreconf not needed with debhelper 10
+  * Do not parse debian/changelog
 
  -- Andreas Tille <tille at debian.org>  Mon, 28 Aug 2017 14:10:27 +0200
 
diff --git a/debian/rules b/debian/rules
index 86cb34e..626a953 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
-DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+include /usr/share/dpkg/default.mk
+
 build3vers := $(shell py3versions -sv)
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
@@ -35,9 +36,9 @@ override_dh_install:
 	d-shlibmove --commit \
 		    --multiarch \
 		    --devunversioned \
-		    --movedev "debian/tmp/usr/include/$(DEBPKGNAME)*/$(DEBPKGNAME)/*.hpp" usr/include/$(DEBPKGNAME) \
-		    --movedev "debian/tmp/usr/include/$(DEBPKGNAME)*/$(DEBPKGNAME)/*.h" usr/include/$(DEBPKGNAME) \
-			debian/tmp/usr/lib/*/lib$(DEBPKGNAME)-*.so
+		    --movedev "debian/tmp/usr/include/$(DEB_SOURCE)*/$(DEB_SOURCE)/*.hpp" usr/include/$(DEB_SOURCE) \
+		    --movedev "debian/tmp/usr/include/$(DEB_SOURCE)*/$(DEB_SOURCE)/*.h" usr/include/$(DEB_SOURCE) \
+			debian/tmp/usr/lib/*/lib$(DEB_SOURCE)-*.so
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-swig --enable-perl-binding

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