[med-svn] [qiime] 04/12: d/rules: 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 qiime.

commit 240c3b33ac790b3aa30123bd82dd044e9d6380d4
Author: Andreas Tille <tille at debian.org>
Date:   Fri Nov 17 13:04:35 2017 +0100

    d/rules: do not parse d/changelog
---
 debian/changelog |  1 +
 debian/rules     | 14 +++++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4cef3c6..cc56e8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ qiime (1.9.1+dfsg-2) UNRELEASED; urgency=medium
   * cme fix dpkg-control
   * Standards-Version: 4.1.1
   * Fix lintian-override about false positives
+  * d/rules: do not parse d/changelog
 
  -- Steffen Moeller <moeller at debian.org>  Fri, 05 Feb 2016 22:56:51 +0100
 
diff --git a/debian/rules b/debian/rules
index 0391a56..daac0a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# debian/rules for Qiime
-# Tim Booth <tbooth at ceh.ac.uk>, Andreas Tille <tille at debian.org>
-# GPL
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+include /usr/share/dpkg/default.mk
 
 %:
 	dh $@ --with python2
@@ -44,13 +40,13 @@ override_dh_auto_clean:
 	rm -rf jobs tests/jobs
 	rm -rf qiime.egg-info
 
-export ROOTDIR=debian/$(pkg)
+export ROOTDIR=debian/$(DEB_SOURCE)
 
 #Lots of shuffling to be done...
-# Python scripts go into /usr/lib/$(pkg)/bin (not /usr/bin)
+# Python scripts go into /usr/lib/$(DEB_SOURCE)/bin (not /usr/bin)
 # Helper script goes into /usr/bin
-# Setup scripts go into /usr/lib/$(pkg)/shell
-# Default configuration goes into /etc/$(pkg)/default_qiime_config
+# Setup scripts go into /usr/lib/$(DEB_SOURCE)/shell
+# Default configuration goes into /etc/$(DEB_SOURCE)/default_qiime_config
 # ...see debian/*.install files
 override_dh_install-arch:
 	dh_install -a

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