[med-svn] [stacks] 04/07: d/rules: use DEB_SOURCE

[Andreas Tille]

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

tille pushed a commit to branch master
in repository stacks.

commit 55df4201f2d26e2a83261cb761f94a868c21a8af
Author: Andreas Tille <tille at debian.org>
Date:   Sat Jun 24 08:14:22 2017 +0200

    d/rules: use DEB_SOURCE
---
 debian/changelog |  1 +
 debian/rules     | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1058b11..2c95711 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ stacks (1.46-1) UNRELEASED; urgency=medium
   * Standards-Version: 4.0.0 (no changes needed)
   * do not disable PIE
     Closes: #865668
+  * d/rules: use DEB_SOURCE
 
  -- Andreas Tille <tille at debian.org>  Sat, 24 Jun 2017 08:10:15 +0200
 
diff --git a/debian/rules b/debian/rules
index 609d49d..63d547d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
-
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+include /usr/share/dpkg/default.mk
+
 %:
 	dh $@ --with python2
 
@@ -22,7 +22,7 @@ override_dh_install:
 	cp php/constants.php.dist ./constants.php
 	dh_install
 	# Skip this bit if not building stacks
-	! cd debian/$(pkg)/usr/lib/$(pkg)/bin || \
+	! cd debian/$(DEB_SOURCE)/usr/lib/$(DEB_SOURCE)/bin || \
 	  for f in *.pl ; do \
 	    ln -s "$$f" "`basename $$f .pl`" ; \
 	  done
@@ -37,10 +37,10 @@ override_dh_install:
 
 override_dh_link:
 	dh_link
-	mkdir -p debian/$(pkg)/usr/lib/debian-med/bin
-	cd debian/$(pkg)/usr/lib/debian-med/bin && \
-	for f in `ls $(CURDIR)/debian/$(pkg)/usr/lib/$(pkg)/bin` ; do \
-	    ln -s ../../$(pkg)/bin/$$f ; \
+	mkdir -p debian/$(DEB_SOURCE)/usr/lib/debian-med/bin
+	cd debian/$(DEB_SOURCE)/usr/lib/debian-med/bin && \
+	for f in `ls $(CURDIR)/debian/$(DEB_SOURCE)/usr/lib/$(DEB_SOURCE)/bin` ; do \
+	    ln -s ../../$(DEB_SOURCE)/bin/$$f ; \
 	done
 
 override_dh_auto_test:

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