[Python-modules-commits] [nose2] 12/16: Cleans d/rules

[Pierre-Elliott Bécue]

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

peb-guest pushed a commit to branch master
in repository nose2.

commit ab4fb1f3f03b8c8a9256b8477c988a8adfe37f23
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Sat Dec 23 19:24:02 2017 +0100

    Cleans d/rules
---
 debian/changelog              |  5 +++++
 debian/python3-nose2.manpages |  2 +-
 debian/rules                  | 16 +++++++---------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5967934..2cf05d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,11 @@ nose2 (0.7.3-1) unstable; urgency=medium
     - Rely on python3-sphinx instead of python-sphinx
     - Add a Testsuite
     - Use Sphinx RTD theme
+  * d/rules:
+    - Clean changelog reading calls and use dpkg's pkg-info makefile include
+      to provide adapted variables.
+    - Change the cp call for nose2-3 as python3 version is 3.6
+  * d/python3-nose2.manpages: take into account d/rules changes
   * d/copyright: nose2/backports/ordereddict.py no longer exists.
   * d/compat: bump to 11
 
diff --git a/debian/python3-nose2.manpages b/debian/python3-nose2.manpages
index 92a2234..2768efc 100644
--- a/debian/python3-nose2.manpages
+++ b/debian/python3-nose2.manpages
@@ -1,2 +1,2 @@
 debian/nose2-3.1
-debian/nose2-3.5.1
+debian/nose2-3.6.3
diff --git a/debian/rules b/debian/rules
index 00472e4..bd046ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,16 +3,14 @@
 #export DH_VERBOSE=1
 export PYBUILD_NAME=nose2
 
-export PKG_VERSION=$(shell dpkg-parsechangelog --show-field version)
-export SOURCE_DATE_EPOCH=$(shell dpkg-parsechangelog -S Timestamp)
-
+include /usr/share/dpkg/pkg-info.mk
 
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_sphinxdoc:
 	sphinx-build -b html -d debian/tmp/doctrees docs \
-		debian/python-nose2-doc/usr/share/doc/python-nose2-doc/html
+		debian/python-nose2-doc/usr/share/doc/python-nose2/html
 	dh_sphinxdoc
 
 override_dh_auto_install:
@@ -21,16 +19,16 @@ override_dh_auto_install:
 	   debian/python3-nose2/usr/bin/nose2-3
 
 override_dh_installman:
-	PYTHONPATH=$(CURDIR) help2man -n nose2 -s 1 -o debian/nose2.1 \
-		 --version-string=$(PKG_VERSION) \
+	PYTHONPATH=${CURDIR} help2man -n nose2 -s 1 -o debian/nose2.1 \
+		 --version-string=${DEB_VERSION} \
 		 --no-discard-stderr --no-info \
 		 debian/python-nose2/usr/bin/nose2
-	PYTHONPATH=$(CURDIR) help2man -n nose2-3 -s 1 -o debian/nose2-3.1 \
-		 --version-string=$(PKG_VERSION) \
+	PYTHONPATH=${CURDIR} help2man -n nose2-3 -s 1 -o debian/nose2-3.1 \
+		 --version-string=${DEB_VERSION} \
 		 --no-discard-stderr --no-info \
 		 debian/python3-nose2/usr/bin/nose2-3
 	cp debian/nose2.1   debian/nose2-2.7.1
-	cp debian/nose2-3.1 debian/nose2-3.5.1
+	cp debian/nose2-3.1 debian/nose2-3.6.3
 	dh_installman
 
 override_dh_auto_test:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/nose2.git