[neon/backports-jammy/libsignon-glib/Neon/unstable] debian: rules: switch to /usr/share/dpkg/architecture.mk

[Pino Toscano]

Git commit a78614769d71ecdb0a5ccf2fd9bb4574c609fe08 by Pino Toscano.
Committed on 31/12/2020 at 13:11.
Pushed by carlosdem into branch 'Neon/unstable'.

rules: switch to /usr/share/dpkg/architecture.mk

drop redundant queries

M  +3    -0    debian/changelog
M  +1    -3    debian/rules

https://invent.kde.org/neon/backports-jammy/libsignon-glib/-/commit/a78614769d71ecdb0a5ccf2fd9bb4574c609fe08

diff --git a/debian/changelog b/debian/changelog
index 088a61b..3e83f64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,9 @@ libsignon-glib (1.15-0r1) UNRELEASED; urgency=medium
   * Add Rules-Requires-Root: no.
   * Tighten gir1.2-signon-1.0 dependency in libsignon-glib-dev.
   * Remove the explicit as-needed linking, as it is done by binutils now.
+  * Switch from /usr/share/dpkg/default.mk to /usr/share/dpkg/architecture.mk,
+    as we need bits only from the latter
+    - drop the manual dpkg-architecture queries
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 31 Dec 2020 12:54:04 +0100
 
diff --git a/debian/rules b/debian/rules
index 23222a9..9ed1b56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,11 @@
 DH_VERBOSE=1
 
 DPKG_EXPORT_BUILDFLAGS=1
-include /usr/share/dpkg/default.mk
+include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND=-Wall -pendantic
 
-BUILD:=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 %:
 	dh $@ --with gir