[Reproducible-commits] [diffoscope] 01/04: Move the sanity check for version number from clean to build rule

Jérémy Bobbio lunar at moszumanska.debian.org
Sun Aug 9 07:58:38 UTC 2015


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

lunar pushed a commit to branch master
in repository diffoscope.

commit e81fcd93d52b8d095791f894323447cb667292a8
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sun Aug 9 09:26:25 2015 +0200

    Move the sanity check for version number from clean to build rule
    
    I hope this will prevent another misversioned upload.
---
 debian/rules | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 2164267..78ea5ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,13 @@ VERSION = $(shell dpkg-parsechangelog --show-field Version)
 %:
 	dh $@ --with python2 --buildsystem=pybuild
 
+override_dh_auto_build:
+	@if ! grep -q 'VERSION = "$(VERSION)"' diffoscope/__init__.py; then \
+		echo "Version in debian/changelog doesn't match diffoscope version"; \
+		exit 1; \
+	fi
+	dh_auto_build -O--buildsystem=pybuild
+
 override_dh_gencontrol:
 	echo "diffoscope:Recommends=$$(./diffoscope.py --list-tools | tail -n 1 | \
 		sed -e 's/\(^\| \)\(coreutils\|diffutils\|e2fsprogs\|findutils\|gzip\)\(,\|$$\)//g')" >> debian/diffoscope.substvars
@@ -22,10 +29,6 @@ override_dh_installman: debian/diffoscope.1
 
 override_dh_clean:
 	rm -f debian/diffoscope.1
-	@if ! grep -q 'VERSION = "$(VERSION)"' diffoscope/__init__.py; then \
-		echo "Version in debian/changelog doesn't match diffoscope version"; \
-		exit 1; \
-	fi
 	dh_clean -O--buildsystem=pybuild
 
 diffoscope/presenters/icon.py: favicon.png

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



More information about the Reproducible-commits mailing list