[kernel] r8336 - dists/trunk/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: Thu Mar  8 23:18:38 2007
New Revision: 8336

Modified:
   dists/trunk/linux-2.6/debian/rules
Log:
debian/rules: Ignore changelog changes for binnmus.


Modified: dists/trunk/linux-2.6/debian/rules
==============================================================================
--- dists/trunk/linux-2.6/debian/rules	(original)
+++ dists/trunk/linux-2.6/debian/rules	Thu Mar  8 23:18:38 2007
@@ -6,7 +6,9 @@
 DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 SOURCE   := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p')
-VERSION  := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)-[^-]*$$,\1,p')
+VERSION_DEBIAN := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
+VERSION  := $(shell echo "$(VERSION_DEBIAN)" | sed -e 's,-[^-]*$$,,')
+VERSION_DEBIAN_BINNMU := $(shell echo "$(VERSION_DEBIAN)" | sed -ne 's,.*\+b\(.*\)$$,\1,p')
 
 include debian/rules.defs
 
@@ -65,16 +67,18 @@
 
 binary:	binary-indep binary-arch
 
-#
-# Makes the master debian/control file by substituting
-# variable values into the template.
-#
 CONTROL_FILES = debian/changelog $(wildcard debian/templates/*.in)
 CONTROL_FILES += debian/arch/defines $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines)
 debian/control debian/rules.gen: debian/bin/gencontrol.py $(CONTROL_FILES)
 	if [ -f debian/control.md5sum ]; then \
-		if ! md5sum --check debian/control.md5sum --status; then \
-			$(MAKE) -f debian/rules debian/control-real; \
+		if [ "$(VERSION_DEBIAN_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; \