Bug#890281: xkbset FTCBFS: uses the build architecture compiler

[Helmut Grohne]

Source: xkbset
Version: 0.5-7
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap
Control: block -1 by 438298
Control: tags 438298 + patch

xkbset fails to cross build from source, because it uses the build
architecture toolchain. dh_auto_build fixes that. Then it fails to cross
build, because it uses the build architecture strip via install. The
easiest way to fix that (deferring stripping to dh_strip) happens to
also fix #438298. The attached patch contains both fixes. Please
consider applying it. In compat 11, dh_auto_install will do.

Helmut
-------------- next part --------------
diff --minimal -Nru xkbset-0.5/debian/changelog xkbset-0.5/debian/changelog
--- xkbset-0.5/debian/changelog	2017-10-16 01:11:01.000000000 +0200
+++ xkbset-0.5/debian/changelog	2018-02-12 22:38:40.000000000 +0100
@@ -1,3 +1,11 @@
+xkbset (0.5-7.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Let dh_auto_build pass CC to make. (Closes: #-1)
+  * Don't strip at make install time. (Closes: #438298)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 12 Feb 2018 22:38:40 +0100
+
 xkbset (0.5-7) unstable; urgency=medium
 
   * Adopt package (closes: Bug#847599).
diff --minimal -Nru xkbset-0.5/debian/rules xkbset-0.5/debian/rules
--- xkbset-0.5/debian/rules	2017-02-26 17:01:37.000000000 +0100
+++ xkbset-0.5/debian/rules	2018-02-12 22:38:40.000000000 +0100
@@ -16,7 +16,7 @@
 build: build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE)
+	dh_auto_build
 	touch build-stamp
 
 clean:
@@ -32,7 +32,7 @@
 	dh_prep
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/xkbset
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/xkbset 'INSTALL=install --strip-program=true'
 
 binary-indep: build install