Control: retitle -1 unblock: pkgconf/0.9.12-4 On 26/02/17 11:19, Niels Thykier wrote: > Andrew Shadura: >> Right, I thought that apt replacing one package by the other is a >> sufficient condition to consider the package correct. >> >> Niels, Helmut, how about the diff I attached?
> Ok with me. I forgot one bit, which is renaming /usr/lib/pkg-config.multiarch to /usr/lib/pkgconf.multiarch. The diff is attached. unblock pkgconf/0.9.12-4 -- Cheers, Andrew
diff --git a/debian/changelog b/debian/changelog
index e4ffced..e804b68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pkgconf (0.9.12-4) unstable; urgency=medium
+
+ * Store pkg-config architecture in /usr/lib/pkgconf.multiarch, not
+ pkg-config.multiarch.
+
+ -- Andrew Shadura <andre...@debian.org> Sun, 26 Feb 2017 13:37:28 +0100
+
pkgconf (0.9.12-3) unstable; urgency=medium
* Upload to unstable.
diff --git a/debian/pkg-config-crosswrapper b/debian/pkg-config-crosswrapper
index f658fab..0bd6276 100755
--- a/debian/pkg-config-crosswrapper
+++ b/debian/pkg-config-crosswrapper
@@ -12,7 +12,7 @@ if [ x"${PKG_CONFIG_LIBDIR+set}" = x ]; then
# Normalized multiarch path if any, e.g. i386-linux-gnu for i386
multiarch="`dpkg-architecture -t"${triplet}" -qDEB_HOST_MULTIARCH 2>/dev/null`"
# Native multiarch path
- native_multiarch="$(cat /usr/lib/pkg-config.multiarch)"
+ native_multiarch="$(cat /usr/lib/pkgconf.multiarch)"
# This can be used for native builds as well, in that case, just exec pkg-config "$@" directly.
if [ "$native_multiarch" = "$multiarch" ]; then
diff --git a/debian/rules b/debian/rules
index d8ae50b..2cfbfeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,6 @@ endif
override_dh_auto_install:
dh_auto_install
chmod +x debian/pkg-config-crosswrapper debian/pkgconf-dpkghook
- echo $(DEB_HOST_MULTIARCH) > debian/pkgconf/usr/lib/pkg-config.multiarch
+ echo $(DEB_HOST_MULTIARCH) > debian/pkgconf/usr/lib/pkgconf.multiarch
.PHONY: override_dh_auto_configure override_dh_auto_install
signature.asc
Description: OpenPGP digital signature
