Change the check for stale debian/control to tolerate binNMUs (Closes: #649005)

svn path=/dists/sid/linux-tools/; revision=18290
This commit is contained in:
Ben Hutchings 2011-11-17 03:17:16 +00:00
parent 0074a87e33
commit 679a4bb14f
2 changed files with 16 additions and 7 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
linux-tools (3.1.1-2) UNRELEASED; urgency=low
* Change the check for stale debian/control to tolerate binNMUs
(Closes: #649005)
-- Ben Hutchings <ben@decadent.org.uk> Thu, 17 Nov 2011 03:07:31 +0000
linux-tools (3.1.1-1) unstable; urgency=low
* New upstream release

16
debian/rules vendored
View File

@ -55,13 +55,15 @@ binary: binary-indep binary-arch
CONTROL_FILES = debian/changelog $(wildcard debian/templates/control.*)
debian/control debian/rules.gen: debian/bin/gencontrol.py $(CONTROL_FILES)
+if [ -f debian/control.md5sum ]; then \
if md5sum $^ | diff - debian/control.md5sum > /dev/null; then true; else \
$(MAKE) -f debian/rules debian/control-real; \
fi \
else \
$(MAKE) -f debian/rules debian/control-real; \
fi
ifeq ($(wildcard debian/control.md5sum),)
$(MAKE) -f debian/rules debian/control-real
else ifeq ($(VERSION_DEBIAN_BINNMU),)
md5sum --check debian/control.md5sum --status || \
$(MAKE) -f debian/rules debian/control-real
else
grep -v debian/changelog debian/control.md5sum | md5sum --check - --status || \
$(MAKE) -f debian/rules debian/control-real
endif
debian/control-real: debian/bin/gencontrol.py $(CONTROL_FILES)
chmod +x $<