[kernel] r18683 - in dists/trunk/firmware-nonfree/debian: . templates

[Ben Hutchings]

Author: benh
Date: Sat Feb 11 18:27:11 2012
New Revision: 18683

Log:
debian/control: Set Multi-Arch: foreign to allow for installation of foreign linux-image packages

Modified:
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/debian/rules.real
   dists/trunk/firmware-nonfree/debian/templates/control.binary.in

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Sat Feb 11 18:23:54 2012	(r18682)
+++ dists/trunk/firmware-nonfree/debian/changelog	Sat Feb 11 18:27:11 2012	(r18683)
@@ -1,3 +1,10 @@
+firmware-nonfree (0.36) UNRELEASED; urgency=low
+
+  * debian/control: Set Multi-Arch: foreign to allow for installation
+    of foreign linux-image packages
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 11 Feb 2012 18:22:23 +0000
+
 firmware-nonfree (0.35) unstable; urgency=low
 
   * Add version to firmware-libertas's conflict with libertas-firmware so

Modified: dists/trunk/firmware-nonfree/debian/rules.real
==============================================================================
--- dists/trunk/firmware-nonfree/debian/rules.real	Sat Feb 11 18:23:54 2012	(r18682)
+++ dists/trunk/firmware-nonfree/debian/rules.real	Sat Feb 11 18:27:11 2012	(r18683)
@@ -2,6 +2,7 @@
 DEB_HOST_ARCH     := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_ARCH    := $(shell dpkg-architecture -a$(ARCH) -qDEB_BUILD_ARCH)
+HAVE_MULTIARCH    := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
 
 export DH_OPTIONS
 
@@ -16,6 +17,11 @@
 	dh_testdir
 	dh_testroot
 	dh_prep
+ifneq (,$(HAVE_MULTIARCH))
+	echo firmware:Multi-Arch=foreign >>debian/$(PACKAGE_NAME).substvars
+else
+	echo firmware:Multi-Arch= >>debian/$(PACKAGE_NAME).substvars
+endif
 	@for i in $(FILES); do \
 	  s=$(PACKAGE)/"$${i%:*}"; \
 	  d=/lib/firmware/"$${i#*:}"; \

Modified: dists/trunk/firmware-nonfree/debian/templates/control.binary.in
==============================================================================
--- dists/trunk/firmware-nonfree/debian/templates/control.binary.in	Sat Feb 11 18:23:54 2012	(r18682)
+++ dists/trunk/firmware-nonfree/debian/templates/control.binary.in	Sat Feb 11 18:27:11 2012	(r18683)
@@ -7,4 +7,5 @@
 Description: Binary firmware for @desc@
  This package contains the binary firmware for @longdesc at .
 Homepage: @uri@
+Multi-Arch: ${firmware:Multi-Arch}