[diffoscope] 01/01: Allow to build a mismatching version between diffoscope and the debian changelog if the target distribution is UNRELEASED.

Mattia Rizzolo mattia at debian.org
Sun Sep 11 15:24:18 CEST 2016


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

mattia pushed a commit to branch master
in repository diffoscope.

commit 5dcdc3f51c88be95444c6c040245b1fbefe9915c
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sun Sep 11 13:24:00 2016 +0000

    Allow to build a mismatching version between diffoscope and the debian changelog if the target distribution is UNRELEASED.
---
 debian/changelog | 2 ++
 debian/rules     | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7f70c75..040b5dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,8 @@ diffoscope (60) UNRELEASED; urgency=medium
     + Don't install '/usr/lib/python3/dist-packages/.coverage'.
     + Run the basic-command-line test during package build.
     + Be even more verbose about failing tests.
+    + Allow to build a mismatching version between diffoscope and the debian
+      changelog if the target distribution is UNRELEASED.
   * Comparators
     + ppu:
       - Unbreak ppu_version detection.
diff --git a/debian/rules b/debian/rules
index 08b17ba..4cd4b9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,9 @@ VERSION_dch := $(shell dpkg-parsechangelog --show-field Version)
 VERSION_py := $(shell awk '/^VERSION = / {gsub(/"/, "", $$3); print $$3}' diffoscope/__init__.py )
 
 ifneq ($(VERSION_dch),$(VERSION_py))
- $(error "Version in debian/changelog doesn't match diffoscope version")
+ ifneq ($(shell dpkg-parsechangelog --show-field Distribution),UNRELEASED)
+  $(error "Version in debian/changelog doesn't match diffoscope version")
+ endif
 endif
 
 export PATH := $(CURDIR)/bin:$(PATH)

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


More information about the diffoscope mailing list