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

[Ben Hutchings]

Author: benh
Date: Mon May 11 19:27:40 2015
New Revision: 22644

Log:
Remove support for backporting to non-multi-arch versions

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

Modified: dists/trunk/firmware-nonfree/debian/rules.real
==============================================================================
--- dists/trunk/firmware-nonfree/debian/rules.real	Mon May 11 19:25:22 2015	(r22643)
+++ dists/trunk/firmware-nonfree/debian/rules.real	Mon May 11 19:27:40 2015	(r22644)
@@ -17,11 +17,6 @@
 	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	Mon May 11 19:25:22 2015	(r22643)
+++ dists/trunk/firmware-nonfree/debian/templates/control.binary.in	Mon May 11 19:27:40 2015	(r22644)
@@ -10,5 +10,5 @@
 Description: Binary firmware for @desc@
  This package contains the binary firmware for @longdesc at .
 Homepage: @uri@
-Multi-Arch: ${firmware:Multi-Arch}
+Multi-Arch: foreign