From cf9ecddee2c53c56171267ca29fd6f16c8a36cab Mon Sep 17 00:00:00 2001 From: Angus Lees Date: Tue, 26 Jan 2016 05:40:38 +1100 Subject: [PATCH] Declare dh_install overrides as -arch Guard arch-dependent dh_install commands appropriately, fixing arch-indep-only builds. (Closes: #809124) --- debian/changelog | 4 +++- debian/rules | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8f1931b349..e26edfb051 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ rustc (1.6.0+dfsg1-2) unstable; UNRELEASED to remove the string "-Werror". (Closes: #812448) * Disable new gcc-6 "-Wmisleading-indentation" warning, which triggers (incorrectly) on src/rt/miniz.c. (Closes: #811573) + * Guard arch-dependent dh_install commands appropriately, fixing + arch-indep-only builds. (Closes: #809124) - -- Angus Lees Tue, 26 Jan 2016 04:01:56 +1100 + -- Angus Lees Tue, 26 Jan 2016 05:40:14 +1100 rustc (1.6.0+dfsg1-1) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index d6625cb303..f895e34ead 100755 --- a/debian/rules +++ b/debian/rules @@ -118,7 +118,7 @@ ifneq (,$(BUILD_DOCS)) find $(DEB_DESTDIR) \( -iname '*.html' -empty -o -name .lock -o -name '*.inc' \) -delete endif -override_dh_install: +override_dh_install-arch: dh_install dh_install -p$(LIBSTD_PKG) usr/lib/$(DEB_HOST_MULTIARCH)/