[Python-modules-commits] [sphinx] 01/01: Use pkg-info.mk to retrieve the upstream version number.

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch debian/master
in repository sphinx.

commit 5ad38688ca703fb178fd40b6d487d0b5edd0c5aa
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Sep 26 16:54:05 2017 +0300

    Use pkg-info.mk to retrieve the upstream version number.
---
 debian/changelog | 1 +
 debian/rules     | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ccb95fa..3845eec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ sphinx (1.6.4-1) UNRELEASED; urgency=medium
   * dh_sphinxdoc: Turn warning about missing SOURCELINK_SUFFIX to an error.
   * Change sphinx-common trigger from interest to interest-noawait.
   * Bump Standards-Version to 4.1.0, no changes needed.
+  * Use pkg-info.mk to retrieve the upstream version number.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 23 Sep 2017 17:17:32 +0300
 
diff --git a/debian/rules b/debian/rules
index fc5d1f3..5a5048a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,16 +2,13 @@
 # -*- makefile -*-
 
 include /usr/share/python/python.mk
+include /usr/share/dpkg/pkg-info.mk
 
 export NO_PKG_MANGLE=1
 export PYTHONWARNINGS=d
 export PYTHONHASHSEED=random
 export http_proxy=http://127.0.0.1:9/
 
-here = $(dir $(firstword $(MAKEFILE_LIST)))/..
-debian_version = $(word 2,$(shell cd $(here) && dpkg-parsechangelog | grep ^Version:))
-upstream_version = $(subst ~,,$(firstword $(subst -, ,$(debian_version))))
-
 locales = $(notdir $(patsubst %/LC_MESSAGES,%,$(wildcard sphinx/locale/*/LC_MESSAGES)))
 scripts = $(sort $(basename $(wildcard sphinx-*.py)))
 
@@ -151,7 +148,7 @@ binary binary-indep: build-stamp
 	./debian/dh-sphinxdoc/dh_sphinxdoc -p sphinx-doc /usr/share/doc/sphinx-doc/html/
 	dh_installexamples
 	cd debian/dh-sphinxdoc/ && pod2man -c Debhelper -r '' dh_sphinxdoc dh_sphinxdoc.1
-ifneq ($(shell grep -h '^[.]TH' debian/*.1 | cut -d ' ' -f 6-7 | sort -u), "Sphinx $(upstream_version)")
+ifneq ($(shell grep -h '^[.]TH' debian/*.1 | cut -d ' ' -f 6-7 | sort -u), "Sphinx $(DEB_VERSION_UPSTREAM)")
 	$(warning W: version numbers in the manual pages are out of date)
 endif
 	dh_installman

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