linux-cpupower: Use dh-exec architecture filtering for x86-specific filesdebian/4.9.6-2

Listing usr/sbin in linux-cpupower.install caused FTBFS on !x86 as
cpupower itself doesn't install anything there.  Do the architecture
filtering in the debhelper lists instead of complicating
debian/rules.real further.

6 files changed, 16 insertions, 6 deletions

diff --git a/debian/.gitignore b/debian/.gitignore
index f24d31d9fec2..d040fa3c7b73 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -17,6 +17,8 @@
 /liblockdep*/
 /libusbip-dev/
 /linux-*
+!/linux-cpupower.install
+!/linux-cpupower.manpages
 /lockdep/
 /po/
 /rules.gen
diff --git a/debian/changelog b/debian/changelog
index a7ae16ccf216..6f953596d060 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (4.9.6-2) unstable; urgency=medium
+
+  * linux-cpupower: Use dh-exec architecture filtering for x86-specific files
+    (fixes FTBFS on !x86)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Fri, 27 Jan 2017 22:09:50 +0000
+
 linux (4.9.6-1) unstable; urgency=medium
 
   * New upstream stable update:
diff --git a/debian/linux-cpupower.install b/debian/linux-cpupower.install
index e79f8d192413..cbed747b987a 100644..100755
--- a/debian/linux-cpupower.install
+++ b/debian/linux-cpupower.install
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
 usr/bin
-usr/sbin
+[i386 amd64 x32] usr/sbin
 usr/share/
diff --git a/debian/linux-cpupower.manpages b/debian/linux-cpupower.manpages
new file mode 100755
index 000000000000..96f9593efbf7
--- /dev/null
+++ b/debian/linux-cpupower.manpages
@@ -0,0 +1,3 @@
+#!/usr/bin/dh-exec
+[i386 amd64 x32] tools/power/x86/turbostat/turbostat.8
+[i386 amd64 x32] tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.8
diff --git a/debian/rules.real b/debian/rules.real
index 868efa3a2f18..000cb3254822 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -579,10 +579,7 @@ endif
 	dh_installchangelogs
 ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
 	dh_installdocs
-ifneq ($(filter i386 amd64 x32,$(DEB_HOST_ARCH)),)
-	dh_installman tools/power/x86/turbostat/turbostat.8 \
-		tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.8
-endif
+	dh_installman
 endif
 	dh_strip
 	dh_compress
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 6123d082dc2f..99ae41559069 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -4,7 +4,7 @@ Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: Bastian Blank <waldi@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@decadent.org.uk>, Salvatore Bonaccorso <carnil@debian.org>
 Standards-Version: 3.9.8
 Build-Depends:
- debhelper (>= 10.1~),
+ debhelper (>= 10.1~), dh-exec,
 # used to run debian/bin/*.py
  python3:any,
 # used by debian/rules.real to prepare the source