[kernel] r8340 - dists/trunk/linux-2.6/debian/modules

[Bastian Blank]

Author: waldi
Date: Fri Mar  9 14:10:58 2007
New Revision: 8340

Modified:
   dists/trunk/linux-2.6/debian/modules/rules.include
Log:
debian/modules/rules.include: Adopt binnmu changes.


Modified: dists/trunk/linux-2.6/debian/modules/rules.include
==============================================================================
--- dists/trunk/linux-2.6/debian/modules/rules.include	(original)
+++ dists/trunk/linux-2.6/debian/modules/rules.include	Fri Mar  9 14:10:58 2007
@@ -5,6 +5,8 @@
 
 include $(__MODULES_DIR)rules.defs
 
+__BINNMU := $(shell dpkg-parsechangelog | sed -ne 's,^Version: .*\+b\(.*\)$$,\1,p')
+
 BUILD_STAMP = $(STAMPS_DIR)/build-base
 
 build: debian/control $(BUILD_STAMP)
@@ -36,8 +38,14 @@
 GENCONTROL = $(__MODULES_DIR)gencontrol.py
 debian/control debian/rules.gen: $(CONTROL_FILES)
 	if [ -f debian/control ] && [ -f debian/control.md5sum ] && [ -f debian/rules.gen ]; then \
-		if md5sum $^ | diff - debian/control.md5sum > /dev/null; then true; else \
-			$(MAKE) -f debian/rules debian/control-real; \
+		if [ "$(__BINNMU)" ]; then \
+			if ! grep -v debian/changelog debian/control.md5sum | md5sum --check - --status; then \
+				$(MAKE) -f debian/rules debian/control-real; \
+			fi \
+		else \
+			if ! md5sum --check debian/control.md5sum --status; then \
+				$(MAKE) -f debian/rules debian/control-real; \
+			fi \
 		fi \
 	else \
 		$(MAKE) -f debian/rules debian/control-real; \