Bug#858164: unblock: chiark-tcl/1.2.1

[Ian Jackson <ijackson@chiark.greenend.org.uk>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package chiark-tcl


This fixes the RC bug #856526 (detected by piuparts of src:sauce).
There are no other changes.

The source diff is below.


unblock chiark-tcl/1.2.1


diff --git a/debian/changelog b/debian/changelog
index 1848e82..f002642 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chiark-tcl (1.2.1) unstable; urgency=high
+
+  * Multiarch: Use correct M-A triplet (DEB_HOST_MULTIARCH) for
+    libsubdir.  Closes:#856526.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 19 Mar 2017 09:22:48 +0000
+
 chiark-tcl (1.2.0) unstable; urgency=medium
 
   * wiringpi module.  Built only if the wiringpi headers are actually
diff --git a/debian/rules b/debian/rules
index f9ed503..3675728 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,11 +26,12 @@ docdir=usr/share/doc/$(docpackage)
 tclh:=$(firstword $(wildcard /usr/include/tcl8.*/tcl.h))
 tclversion:=$(patsubst /usr/include/tcl%/tcl.h,%,$(tclh))
 
+march := $(shell dpkg-architecture -q DEB_HOST_MULTIARCH)
+libsubdir = /$(march)
+
 garch := $(shell dpkg-architecture -q DEB_HOST_GNU_TYPE)
 ifneq ($(garch),)
 
-libsubdir = /$(garch)
-
 ifeq ($(origin CC),default)
 export CC=$(garch)-gcc
 endif



-- System Information:
Debian Release: 9.0
  APT prefers testing-debug
  APT policy: (500, 'testing-debug'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.8.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)