[kernel] r22919 - dists/trunk/linux-base/debian

[Ben Hutchings]

Author: benh
Date: Tue Aug  4 20:18:07 2015
New Revision: 22919

Log:
Drop support for pre-multiarch releases

Modified:
   dists/trunk/linux-base/debian/control
   dists/trunk/linux-base/debian/rules

Modified: dists/trunk/linux-base/debian/control
==============================================================================
--- dists/trunk/linux-base/debian/control	Tue Aug  4 20:16:48 2015	(r22918)
+++ dists/trunk/linux-base/debian/control	Tue Aug  4 20:18:07 2015	(r22919)
@@ -11,7 +11,7 @@
 Package: linux-base
 Architecture: all
 Depends: ${misc:Depends}
-Multi-Arch: ${linux-base:Multi-Arch}
+Multi-Arch: foreign
 Description: Linux image base package
  This package contains files and support scripts for all Linux
  images.

Modified: dists/trunk/linux-base/debian/rules
==============================================================================
--- dists/trunk/linux-base/debian/rules	Tue Aug  4 20:16:48 2015	(r22918)
+++ dists/trunk/linux-base/debian/rules	Tue Aug  4 20:18:07 2015	(r22919)
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-HAVE_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
-
 build:
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 	perl -Ilib -MTest::Harness -e 'runtests(@ARGV)' lib/t/*.t
@@ -15,11 +13,6 @@
 	dh_testdir
 	dh_testroot
 	dh_prep
-ifneq (,$(HAVE_MULTIARCH))
-	echo linux-base:Multi-Arch=foreign >>debian/linux-base.substvars
-else
-	echo linux-base:Multi-Arch= >>debian/linux-base.substvars
-endif
 	dh_install
 	dh_installman
 	dh_installdebconf