Actually restrict architectures to anything but MIPS.

2 files changed, 29 insertions, 24 deletions

diff --git a/debian/changelog b/debian/changelog
index 65a0f4296..8dfb2cd2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+heimdal (7.1.0+dfsg-6) UNRELEASED; urgency=medium
+
+  * Actually restrict architectures to anything but MIPS.
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Sun, 08 Jan 2017 17:17:35 +0000
+
 heimdal (7.1.0+dfsg-5) unstable; urgency=medium
 
   * Don't build on MIPS, to work around #884227 for now.
diff --git a/debian/control b/debian/control
index d4caa875a..31e92626a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Brian May <bam@debian.org>
 Uploaders: Jelmer Vernooij <jelmer@debian.org>
 Homepage: http://www.h5l.org/
 Standards-Version: 3.9.8
-Architecture: all amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Build-Depends: bison,
                comerr-dev (>= 1.41.11),
                debhelper (>= 9),
@@ -52,7 +51,7 @@ Description: Heimdal Kerberos - documentation
 
 Package: heimdal-kdc
 Priority: extra
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Conflicts: heimdal-clients (<< 0.4e-3),
            heimdal-servers (<< 0.6.3-3),
            kerberos4kth-kdc,
@@ -81,7 +80,7 @@ Description: Heimdal Kerberos - key distribution center (KDC)
 Package: heimdal-multidev
 Section: devel
 Priority: extra
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Conflicts: heimdal-clients (<< 0.4e-7), kerberos4kth-dev
 Depends: comerr-dev,
          libasn1-8-heimdal (= ${binary:Version}),
@@ -117,7 +116,7 @@ Depends: heimdal-multidev (= ${binary:Version}), ${misc:Depends}
 Section: devel
 Conflicts: libkrb5-dev
 Priority: extra
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Description: Heimdal Kerberos - development files
  Heimdal is a free implementation of Kerberos 5 that aims to be
  compatible with MIT Kerberos.
@@ -127,7 +126,7 @@ Description: Heimdal Kerberos - development files
 
 Package: heimdal-clients
 Priority: extra
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: krb5-config, ${misc:Depends}, ${shlibs:Depends}
 Conflicts: ftp (<< 0.16-1),
            heimdal-servers (<< 0.4e-7),
@@ -149,7 +148,7 @@ Description: Heimdal Kerberos - clients
 
 Package: heimdal-kcm
 Priority: extra
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: ${misc:Depends}, ${shlibs:Depends}, lsb-base
 Description: Heimdal Kerberos - KCM daemon
  Heimdal is a free implementation of Kerberos 5 that aims to be
@@ -163,7 +162,7 @@ Description: Heimdal Kerberos - KCM daemon
 
 Package: heimdal-servers
 Priority: extra
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: krb5-config,
          openbsd-inetd|inet-superserver,
          ${misc:Depends},
@@ -187,7 +186,7 @@ Description: Heimdal Kerberos - server programs
 Package: heimdal-dbg
 Multi-Arch: same
 Priority: extra
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Section: debug
 Depends: libkrb5-26-heimdal (= ${binary:Version}),
          ${misc:Depends},
@@ -202,7 +201,7 @@ Package: libheimbase1-heimdal
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Heimdal Kerberos - Base library
  Heimdal is a free implementation of Kerberos 5 that aims to be
@@ -214,7 +213,7 @@ Package: libasn1-8-heimdal
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Heimdal Kerberos - ASN.1 library
  Heimdal is a free implementation of Kerberos 5 that aims to be
@@ -226,7 +225,7 @@ Package: libkrb5-26-heimdal
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Heimdal Kerberos - libraries
  Heimdal is a free implementation of Kerberos 5 that aims to be
@@ -238,7 +237,7 @@ Package: libhdb9-heimdal
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: heimdal-lib (<< 0.3e-5)
 Conflicts: heimdal-libs (<< 0.3e-5)
@@ -253,7 +252,7 @@ Package: libkadm5srv8-heimdal
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Libraries for Heimdal Kerberos
  Heimdal is a free implementation of Kerberos 5, that aims to be
@@ -265,7 +264,7 @@ Package: libkadm5clnt7-heimdal
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Heimdal Kerberos - kadmin client library
  Heimdal is a free implementation of Kerberos 5 that aims to be
@@ -277,7 +276,7 @@ Package: libgssapi3-heimdal
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Conflicts: libgssapi3
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Heimdal Kerberos - GSSAPI support library
@@ -291,7 +290,7 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Priority: extra
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Heimdal Kerberos - KAFS support library
  Heimdal is a free implementation of Kerberos 5 that aims to be
@@ -303,7 +302,7 @@ Package: libroken18-heimdal
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Heimdal Kerberos - roken support library
  Heimdal is a free implementation of Kerberos 5 that aims to be
@@ -316,7 +315,7 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Priority: extra
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Conflicts: libotp0-kerberos4kth
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Heimdal Kerberos - OTP support library
@@ -330,7 +329,7 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Priority: extra
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Conflicts: libsl0-kerberos4kth
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Heimdal Kerberos - SL support library
@@ -344,7 +343,7 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Priority: extra
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Heimdal Kerberos - KDC support library
  Heimdal is a free implementation of Kerberos 5 that aims to be
@@ -354,7 +353,7 @@ Package: libhx509-5-heimdal
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Heimdal Kerberos - X509 support library
  Heimdal is a free implementation of Kerberos 5 that aims to be
@@ -364,7 +363,7 @@ Package: libheimntlm0-heimdal
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Heimdal Kerberos - NTLM support library
  Heimdal is a free implementation of Kerberos 5 that aims to be
@@ -374,7 +373,7 @@ Package: libwind0-heimdal
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Heimdal Kerberos - stringprep implementation
  Heimdal is a free implementation of Kerberos 5 that aims to be
@@ -384,7 +383,7 @@ Package: libhcrypto4-heimdal
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
-Architecture: any
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc sh4 m68k ppc64el x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Heimdal Kerberos - crypto library
  Heimdal is a free implementation of Kerberos 5 that aims to be