[firmware-free] 02/03: Remove support for backporting to non-multi-arch versions

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository firmware-free.

commit 4f3ed38f0416401f6593c73db0012d0b1b10cd50
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Aug 16 18:45:59 2015 +0200

    Remove support for backporting to non-multi-arch versions
---
 debian/rules.real                  | 6 ------
 debian/templates/control.binary.in | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian/rules.real b/debian/rules.real
index ea13cfc..bc474db 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -2,7 +2,6 @@ SHELL  := sh -e
 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
 
@@ -19,11 +18,6 @@ install:
 	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#*:}"; \
diff --git a/debian/templates/control.binary.in b/debian/templates/control.binary.in
index e27e3b0..c8ee944 100644
--- a/debian/templates/control.binary.in
+++ b/debian/templates/control.binary.in
@@ -7,5 +7,5 @@ Suggests: initramfs-tools
 Description: Binary firmware for @desc@
  @longdesc@
 Homepage: @uri@
-Multi-Arch: ${firmware:Multi-Arch}
+Multi-Arch: foreign
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-free.git