[diffoscope] 01/01: d/rules: makes possible to do a backport without changing the version "upstream"

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository diffoscope.

commit 07b752849a2d1f9f59bcf9c7653b3dc53a66175c
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sat Sep 17 13:07:09 2016 +0000

    d/rules: makes possible to do a backport without changing the version "upstream"
---
 debian/rules | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4cd4b9c..9eaf836 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,19 @@
 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)
 
 ifneq ($(VERSION_dch),$(VERSION_py))
- ifneq ($(shell dpkg-parsechangelog --show-field Distribution),UNRELEASED)
-  $(error "Version in debian/changelog doesn't match diffoscope version")
+ 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))
+    else
+     $(error Version in debian/changelog does not match diffoscope version or backport policy)
+    endif
+  else
+   $(error Version in debian/changelog does not match diffoscope version)
+  endif
  endif
 endif
 

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