[diffoscope] 01/01: Use /usr/share/dpkg/pkg-info.mk over manual calls to dpkg-parsechangelog.

Chris Lamb chris at chris-lamb.co.uk
Wed Mar 29 10:20:01 CEST 2017


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

lamby pushed a commit to branch experimental
in repository diffoscope.

commit 00b474d1c26dd1a5b6d80599d94d9f5868e28061
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Mar 29 09:15:29 2017 +0100

    Use /usr/share/dpkg/pkg-info.mk over manual calls to
    dpkg-parsechangelog.
---
 debian/rules | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index c11bdc4..6a4a414 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,15 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+
 MANPAGES = $(patsubst %.1.rst,%.1,$(wildcard debian/*.1.rst))
-VERSION_dch := $(shell dpkg-parsechangelog --show-field Version)
-VERSION_py := $(shell awk '/^VERSION = / {gsub(/"/, "", $$3); print $$3}' diffoscope/__init__.py )
-DIST := $(shell dpkg-parsechangelog --show-field Distribution)
+PY_VERSION := $(shell awk '/^VERSION = / {gsub(/"/, "", $$3); print $$3}' diffoscope/__init__.py )
 
-ifneq ($(VERSION_dch),$(VERSION_py))
- ifneq ($(DIST),UNRELEASED)
-  ifneq (,$(filter %-backports,$(DIST)))
-    ifeq ($(VERSION_dch:~bpo8+1=),$(VERSION_py))
-     $(info Building a Debian backport, accepting version mismatch $(VERSION_py) <-> $(VERSION_dch))
+ifneq ($(DEB_VERSION),$(PY_VERSION))
+ ifneq ($(DEB_DISTRIBUTION),UNRELEASED)
+  ifneq (,$(filter %-backports,$(DEB_DISTRIBUTION)))
+    ifeq ($(DEB_VERSION:~bpo8+1=),$(PY_VERSION))
+     $(info Building a Debian backport, accepting version mismatch $(PY_VERSION) <-> $(DEB_VERSION))
     else
      $(error Version in debian/changelog does not match diffoscope version or backport policy)
     endif

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


More information about the diffoscope mailing list