[kernel] r18290 - dists/sid/linux-tools/debian

[Ben Hutchings]

Author: benh
Date: Thu Nov 17 03:17:16 2011
New Revision: 18290

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

Modified:
   dists/sid/linux-tools/debian/changelog
   dists/sid/linux-tools/debian/rules

Modified: dists/sid/linux-tools/debian/changelog
==============================================================================
--- dists/sid/linux-tools/debian/changelog	Mon Nov 14 15:58:15 2011	(r18289)
+++ dists/sid/linux-tools/debian/changelog	Thu Nov 17 03:17:16 2011	(r18290)
@@ -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 at decadent.org.uk>  Thu, 17 Nov 2011 03:07:31 +0000
+
 linux-tools (3.1.1-1) unstable; urgency=low
 
   * New upstream release

Modified: dists/sid/linux-tools/debian/rules
==============================================================================
--- dists/sid/linux-tools/debian/rules	Mon Nov 14 15:58:15 2011	(r18289)
+++ dists/sid/linux-tools/debian/rules	Thu Nov 17 03:17:16 2011	(r18290)
@@ -55,13 +55,15 @@
 
 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 $<