[kernel] r18554 - in dists/squeeze-backports/linux-2.6/debian: . templates

[Ben Hutchings]

Author: benh
Date: Wed Jan 18 04:23:51 2012
New Revision: 18554

Log:
Remove the Multi-Arch field from linux-libc-dev when dpkg-architecture does not support multi-arch

Modified:
   dists/squeeze-backports/linux-2.6/debian/rules.real
   dists/squeeze-backports/linux-2.6/debian/templates/control.libc-dev.in

Modified: dists/squeeze-backports/linux-2.6/debian/rules.real
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/rules.real	Wed Jan 18 03:55:21 2012	(r18553)
+++ dists/squeeze-backports/linux-2.6/debian/rules.real	Wed Jan 18 04:23:51 2012	(r18554)
@@ -301,6 +301,9 @@
 	# Move include/asm to arch-specific directory
 	mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
 	mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
+	echo linux-libc-dev:Multi-Arch=same >>debian/$(PACKAGE_NAME).substvars
+else
+	echo linux-libc-dev:Multi-Arch= >>debian/$(PACKAGE_NAME).substvars
 endif
 	
 	+$(MAKE_SELF) install-base

Modified: dists/squeeze-backports/linux-2.6/debian/templates/control.libc-dev.in
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/templates/control.libc-dev.in	Wed Jan 18 03:55:21 2012	(r18553)
+++ dists/squeeze-backports/linux-2.6/debian/templates/control.libc-dev.in	Wed Jan 18 04:23:51 2012	(r18554)
@@ -4,7 +4,7 @@
 Provides: linux-kernel-headers
 Replaces: linux-kernel-headers
 Conflicts: linux-kernel-headers
-Multi-Arch: same
+Multi-Arch: ${linux-libc-dev:Multi-Arch}
 Description: Linux support headers for userspace development
  This package provides userspaces headers from the Linux kernel.  These headers
  are used by the installed headers for GNU glibc and other system libraries.