[SCM] qtbase packaging branch, master, updated. debian/5.9.1+dfsg-9-4-g0fce23a

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=0fce23a

The following commit has been merged in the master branch:
commit 0fce23aadfe9dc4b93c7600799c9722888e2e3bc
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 18 16:55:31 2017 -0300

    Use predefined DEB_HOST_* variables.
---
 debian/changelog | 4 ++++
 debian/rules     | 7 ++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14292d8..d833c54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ qtbase-opensource-src (5.9.1+dfsg-10) UNRELEASED; urgency=medium
   * Add a maintscript to ensure that the obsolete 90qt5-opengl conffile
     is removed on upgrade (closes: #873788).
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * debian/rules: include /usr/share/dpkg/architecture.mk instead of defining
+    DEB_HOST_* variables. Thanks Helmut Grohne!
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Aug 2017 16:27:07 +0300
 
 qtbase-opensource-src (5.9.1+dfsg-9) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index da83611..5bc3797 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+# Use already defined DEB_HOST_* variables.
+include /usr/share/dpkg/architecture.mk
 
 export PATH := $(PATH):$(shell pwd)/bin
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) $(shell getconf LFS_CFLAGS)

-- 
qtbase packaging