diff --git a/debian/changelog b/debian/changelog index 36560fda2..3fb0d2ec9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ linux-tools (3.10-1~exp1) UNRELEASED; urgency=low * debian/patches: Add DEP-3 headers (From, Subject, Forwarded) to all patches * debian/copyright: Convert to machine-readable format (fka DEP-5) * debian/copyright: Add explanation of indirect linking of perf to OpenSSL + * debian/rules.real: Remove support for pre-multiarch dpkg -- Chris Boot Mon, 01 Jul 2013 22:07:42 +0100 diff --git a/debian/rules.real b/debian/rules.real index 0aa38254e..beb766bcb 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -3,7 +3,6 @@ export DH_OPTIONS include debian/rules.defs DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) -HAVE_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) binary-arch: install-kbuild install-usbip ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),) @@ -24,11 +23,6 @@ install-kbuild: $(STAMPS_DIR)/build dh_testdir dh_testroot dh_clean -k -d -ifneq (,$(HAVE_MULTIARCH)) - echo linux-kbuild:Multi-Arch=foreign >>debian/$(PACKAGE_NAME).substvars -else - echo linux-kbuild:Multi-Arch= >>debian/$(PACKAGE_NAME).substvars -endif $(MAKE) -C $(BUILD_DIR)/scripts install prefix=$(DIR) top_srcdir=$(CURDIR) dh_link $(BASE_DIR) /usr/src/$(PACKAGE_NAME) dh_installchangelogs diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in index f985c6310..74cdb2011 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -1,7 +1,7 @@ Package: linux-kbuild-@version@ Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} -Multi-Arch: ${linux-kbuild:Multi-Arch} +Multi-Arch: foreign Description: Kbuild infrastructure for Linux @version@ This package provides the kbuild infrastructure for the headers packages for Linux kernel version @version@.