debian/rules.real: Remove support for pre-multiarch dpkg

svn path=/dists/trunk/linux/; revision=20327

debian/changelog

@@ -15,6 +15,7 @@ linux (3.10-1~exp1) UNRELEASED; urgency=low
   * [x86] efivars: Reenable 'paranoid' size check by default, as it should
     no longer have false positives
   * debian/patches: Reorder and group patches in series
+  * debian/rules.real: Remove support for pre-multiarch dpkg
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 01 Jul 2013 00:58:08 +0100
 

debian/rules.real

@@ -28,13 +28,6 @@ ifneq (,$(filter experimental UNRELEASED,$(DISTRIBUTION)))
   export KW_CHECK_NONFATAL = y
 endif
 
-# Set Multi-Arch fields only when built in a suite that supports it
-ifneq (,$(DEB_HOST_MULTIARCH))
-DEFINE_MULTIARCH = -Vlinux:Multi-Arch=$(1)
-else
-DEFINE_MULTIARCH = -Vlinux:Multi-Arch=
-endif
-
 include debian/rules.defs
 
 stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@
@@ -204,7 +197,7 @@ install-doc: $(STAMPS_DIR)/build-doc
 	| \
 	cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)/html'
 	gzip -9qfr $(OUT_DIR)/Documentation
-	+$(MAKE_SELF) install-base GENCONTROL_ARGS='$(call DEFINE_MULTIARCH,foreign)'
+	+$(MAKE_SELF) install-base
 
 install-manual: PACKAGE_NAME = linux-manual-$(VERSION)
 install-manual: DIR=$(BUILD_DIR)/build-doc
@@ -213,7 +206,7 @@ install-manual: $(STAMPS_DIR)/build-doc
 	dh_prep
 	set -o pipefail; \
 	find $(DIR)/Documentation/DocBook/man/ -name '*.9' | xargs dh_installman
-	+$(MAKE_SELF) install-base GENCONTROL_ARGS='$(call DEFINE_MULTIARCH,foreign)'
+	+$(MAKE_SELF) install-base
 
 install-headers_$(ARCH): PACKAGE_NAMES = linux-headers-$(ABINAME)-all linux-headers-$(ABINAME)-all-$(ARCH)
 install-headers_$(ARCH): DH_OPTIONS = $(foreach p, $(PACKAGE_NAMES), -p$(p))
@@ -319,13 +312,11 @@ install-libc-dev_$(ARCH):
 	rm -rf $(OUT_DIR)/include/drm $(OUT_DIR)/include/scsi
 	find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} +
 
-ifneq (,$(DEB_HOST_MULTIARCH))
 	# 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)/
-endif
 	
-	+$(MAKE_SELF) install-base GENCONTROL_ARGS='$(call DEFINE_MULTIARCH,same)'
+	+$(MAKE_SELF) install-base
 
 install-support: PACKAGE_NAME = linux-support-$(ABINAME)
 install-support: DH_OPTIONS = -p$(PACKAGE_NAME)
@@ -340,7 +331,7 @@ install-support:
 	cp debian/lib/python/debian_linux/*.py $(PACKAGE_DIR)$(PACKAGE_ROOT)/lib/python/debian_linux
 	dh_python2
 	dh_link $(PACKAGE_ROOT) /usr/src/$(PACKAGE_NAME)
-	+$(MAKE_SELF) install-base GENCONTROL_ARGS='$(call DEFINE_MULTIARCH,foreign)'
+	+$(MAKE_SELF) install-base
 
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION)
@@ -509,6 +500,6 @@ install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2 $(foreach F
 	dh_testdir
 	dh_testroot
 	dh_install '$^' /usr/src
-	+$(MAKE_SELF) install-base GENCONTROL_ARGS='$(call DEFINE_MULTIARCH,foreign)'
+	+$(MAKE_SELF) install-base
 
 # vim: filetype=make

debian/templates/control.libc-dev.in

@@ -4,7 +4,7 @@ Depends: ${misc:Depends}
 Provides: linux-kernel-headers
 Replaces: linux-kernel-headers
 Conflicts: linux-kernel-headers
-Multi-Arch: ${linux:Multi-Arch}
+Multi-Arch: same
 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 libc and other system libraries.

debian/templates/control.main.in

@@ -5,7 +5,7 @@ Provides: linux-source
 Depends: binutils, bzip2, ${misc:Depends}
 Recommends: libc6-dev | libc-dev, gcc, make
 Suggests: libncurses-dev | ncurses-dev, libqt4-dev, pkg-config
-Multi-Arch: ${linux:Multi-Arch}
+Multi-Arch: foreign
 Description: Linux kernel source for version @version@ with Debian patches
  This package provides source code for the Linux kernel version @version@.
  This source closely tracks official Linux kernel releases.  Debian's
@@ -17,7 +17,7 @@ Package: linux-doc-@version@
 Architecture: all
 Depends: ${misc:Depends}
 Section: doc
-Multi-Arch: ${linux:Multi-Arch}
+Multi-Arch: foreign
 Description: Linux kernel specific documentation for version @version@
  This package provides the various README files and HTML documentation for
  the Linux kernel version @version@.  Plenty of information, including the
@@ -33,7 +33,7 @@ Section: doc
 Provides: linux-manual
 Conflicts: linux-manual
 Replaces: linux-manual
-Multi-Arch: ${linux:Multi-Arch}
+Multi-Arch: foreign
 Description: Linux kernel API manual pages for version @version@
  This package provides the Kernel Hacker's Guide in the form of
  manual pages, describing the kernel API functions.  They
@@ -48,7 +48,7 @@ Package: linux-support-@abiname@
 Architecture: all
 Section: devel
 Depends: ${python:Depends}, ${misc:Depends}
-Multi-Arch: ${linux:Multi-Arch}
+Multi-Arch: foreign
 Description: Support files for Linux @upstreamversion@
  This package provides support files for the Linux kernel build,
  e.g. scripts to handle ABI information and for generation of