Bug#913416: mate-polkit misbuilds due to build/host confusion
Source: mate-polkit
Version: 1.20.1-1
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap
mate-polkit successfully cross builds a completely broken package. The
multiarch directories use the build architecture triplet. The attached
patch fixes the build/host confusion. Please consider applying it.
Helmut
diff --minimal -Nru mate-polkit-1.20.1/debian/bin/mate-polkit.in mate-polkit-1.20.1/debian/bin/mate-polkit.in
--- mate-polkit-1.20.1/debian/bin/mate-polkit.in 2016-04-18 01:56:18.000000000 +0200
+++ mate-polkit-1.20.1/debian/bin/mate-polkit.in 2018-11-10 19:47:07.000000000 +0100
@@ -1,3 +1,3 @@
#!/bin/sh
-/usr/lib/@BUILD_ARCH@/polkit-mate/polkit-mate-authentication-agent-1 &
+/usr/lib/@DEB_HOST_MULTIARCH@/polkit-mate/polkit-mate-authentication-agent-1 &
diff --minimal -Nru mate-polkit-1.20.1/debian/changelog mate-polkit-1.20.1/debian/changelog
--- mate-polkit-1.20.1/debian/changelog 2018-07-05 18:31:46.000000000 +0200
+++ mate-polkit-1.20.1/debian/changelog 2018-11-10 19:47:50.000000000 +0100
@@ -1,3 +1,10 @@
+mate-polkit (1.20.1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix build/host confusion. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Sat, 10 Nov 2018 19:47:50 +0100
+
mate-polkit (1.20.1-1) unstable; urgency=medium
* New upstream release.
diff --minimal -Nru mate-polkit-1.20.1/debian/rules mate-polkit-1.20.1/debian/rules
--- mate-polkit-1.20.1/debian/rules 2017-12-13 16:21:27.000000000 +0100
+++ mate-polkit-1.20.1/debian/rules 2018-11-10 19:47:48.000000000 +0100
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/architecture.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
@@ -20,9 +21,9 @@
DEB_CONFIGURE_EXTRA_FLAGS := --disable-silent-rules \
--localstatedir=/var \
- --libdir=/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) \
- --includedir=/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) \
- --libexecdir=/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/polkit-mate \
+ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ --includedir=/usr/include/$(DEB_HOST_MULTIARCH) \
+ --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/polkit-mate \
--disable-silent-rules \
--disable-static \
--enable-gtk-doc
@@ -36,7 +37,7 @@
install-wrapper::
mkdir -p debian/tmp/usr/bin/
- cat debian/bin/mate-polkit.in | sed -e 's/@BUILD_ARCH@/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/' > debian/tmp/usr/bin/mate-polkit
+ sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/' < debian/bin/mate-polkit.in > debian/tmp/usr/bin/mate-polkit
get-orig-source:
uscan --noconf --force-download --rename --download-current-version --destdir=..
Reply to: