[mig] 01/01: Remove the Multi-Arch field instead of just making it empty

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository mig.

commit 19a873bf972283e53b405a88e25e600e0d57a49c
Author: Samuel Thibault <address@hidden>
Date:   Tue Aug 18 15:44:17 2015 +0200

    Remove the Multi-Arch field instead of just making it empty
---
 debian/control.in | 2 +-
 debian/rules      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index a46025c..e451720 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -12,7 +12,7 @@ Standards-Version: 3.9.3
 
 Package: address@hidden@
 Architecture: @arch@
-Multi-Arch: @multiarch@
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: GNU Mach Interface Generator
  This is the GNU distribution of the MIG, which is needed to compile
diff --git a/debian/rules b/debian/rules
index e49ffa0..a534710 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,18 +25,18 @@ override_dh_auto_configure:
 
 ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_TARGET_GNU_TYPE))
 ARCH=any-i386
-MULTIARCH=foreign
 else
 CROSS=-$(DEB_TARGET_GNU_TYPE)
 ARCH=$(DEB_HOST_ARCH)
-MULTIARCH=
 endif
 debian/control: debian/control.stamp
 debian/control.stamp: debian/control.in
        sed -e 's/@cross@/$(CROSS)/' \
            -e 's/@arch@/$(ARCH)/' \
-           -e 's/@multiarch@/$(MULTIARCH)/' \
            < $< > debian/control
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_TARGET_GNU_TYPE))
+       sed -i -e '/^Multi-Arch: /d' debian/control
+endif
        touch $@
 
 build-arch: debian/control.stamp

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/mig.git