[neon/extras/grantlee/Neon/release] debian: rules: use /usr/share/dpkg/architecture.mk

[Pino Toscano]

Git commit cb7a6109dda30507a8d41fe814958bcce7469385 by Pino Toscano.
Committed on 26/09/2021 at 15:40.
Pushed by jriddell into branch 'Neon/release'.

rules: use /usr/share/dpkg/architecture.mk

M  +2    -0    debian/changelog
M  +2    -2    debian/rules

https://invent.kde.org/neon/extras/grantlee/commit/cb7a6109dda30507a8d41fe814958bcce7469385

diff --git a/debian/changelog b/debian/changelog
index c8537bc..bada332 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ grantlee5 (5.2.0-4) UNRELEASED; urgency=medium
   * Remove the check for nocheck in $(DEB_BUILD_OPTIONS), as debhelper already
     does not invoke dh_auto_test in compatibility >= 13.
   * Bump Standards-Version to 4.6.0, no changes required.
+  * Use /usr/share/dpkg/architecture.mk instead of querying manually for the
+    $DEB_HOST_* dpkg vars.
 
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Sun, 26 Sep 2021 17:36:19 +0200
 
diff --git a/debian/rules b/debian/rules
index 60d469d..72e57c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
+
 # Disable fixfilepath, as it triggers build failures.
 export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath