Use DEB_HOST_ARCH_CPU instead of DEB_HOST_ARCH

and thus treat *-{i386,amd64} as x86

diff --git a/debian/changelog b/debian/changelog
index 478df65..d57d547 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+os-prober (1.67) UNRELEASED; urgency=medium
+
+  [ James Clarke ]
+  * rules: Use DEB_HOST_ARCH_CPU instead of DEB_HOST_ARCH, and thus treat
+    *-{i386,amd64} as x86
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 29 Sep 2015 01:31:03 +0200
+
 os-prober (1.66) unstable; urgency=medium
 
   * Add -a flag to grep -qs for Windows Vista detection. It appears the

diff --git a/debian/rules b/debian/rules
index 63a5932..81e9ad9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,8 @@
 %:
        dh $@
 
-ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifneq (,$(findstring :$(ARCH):,:i386:amd64:))
+ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+ifneq (,$(filter i386 amd64,$(ARCH)))
 ARCH=x86
 endif