[kernel] r8417 - in dists/etch/linux-2.6/debian: . modules

[Bastian Blank]

Author: waldi
Date: Sun Apr  1 11:14:09 2007
New Revision: 8417

Modified:
   dists/etch/linux-2.6/debian/changelog
   dists/etch/linux-2.6/debian/modules/rules.include
Log:
* debian/changelog: Update.
* debian/modules/rules.include: Make binnmuable.


Modified: dists/etch/linux-2.6/debian/changelog
==============================================================================
--- dists/etch/linux-2.6/debian/changelog	(original)
+++ dists/etch/linux-2.6/debian/changelog	Sun Apr  1 11:14:09 2007
@@ -3,8 +3,9 @@
   * [vserver] Fix overflow in network accounting. (closes: #412132)
   * [vserver] Fix lock accounting.
   * Bump ABI to 5.
+  * Make modules packages binnmuable. 
 
- -- Bastian Blank <waldi at debian.org>  Sun, 01 Apr 2007 08:44:52 +0200
+ -- Bastian Blank <waldi at debian.org>  Sun, 01 Apr 2007 13:13:25 +0200
 
 linux-2.6 (2.6.18.dfsg.1-12) unstable; urgency=low
 

Modified: dists/etch/linux-2.6/debian/modules/rules.include
==============================================================================
--- dists/etch/linux-2.6/debian/modules/rules.include	(original)
+++ dists/etch/linux-2.6/debian/modules/rules.include	Sun Apr  1 11:14:09 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; \