On 26/02/17 08:32, Helmut Grohne wrote:
> Looking at the experimental binary package however, I note that I fail
> to find a diversion for pkg-config-dpkghook and its hook-config. Thus
> the experimental package would actually need a conflicts relation now.
> So I consider the experimental package rc buggy and propose either
> renaming the conflicting files or adding a conflicts relation. Since
> neither /usr/share/pkg-config-crosswrapper nor
> /etc/dpkg/dpkg.cfg.d/pkg-config-hook-config are part of the pkg-config
> API, I'd just rename both to avoid the need for diversions here. Even
> when using conflicts, conffiles will not go away and reusing the
> hook-config file from pkg-config can result in a mess of its own. So I
> actually recommend doing the renaming (s/pkg-config/pkgconf/) in any
> case (even when adding conflicts). If you end up using conflicts, all
> the other diversions can go away as well.
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?
--
Cheers,
Andrew
diff --git a/debian/changelog b/debian/changelog
index 17621ae..e4ffced 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pkgconf (0.9.12-3) unstable; urgency=medium
+
+ * Upload to unstable.
+ * Rename dpkg hook and its config to not conflict with pkg-config.
+
+ -- Andrew Shadura <andre...@debian.org> Sun, 26 Feb 2017 10:57:06 +0100
+
pkgconf (0.9.12-2) experimental; urgency=medium
* Provide pkg-config-compatible cross-building interface:
diff --git a/debian/pkg-config-dpkghook b/debian/pkgconf-dpkghook
similarity index 100%
rename from debian/pkg-config-dpkghook
rename to debian/pkgconf-dpkghook
diff --git a/debian/pkg-config-hook-config b/debian/pkgconf-hook-config
similarity index 62%
rename from debian/pkg-config-hook-config
rename to debian/pkgconf-hook-config
index b230b27..a0b1a6f 100644
--- a/debian/pkg-config-hook-config
+++ b/debian/pkgconf-hook-config
@@ -1 +1 @@
-post-invoke=if { test "$DPKG_HOOK_ACTION" = add-architecture || test "$DPKG_HOOK_ACTION" = remove-architecture; } && test -x /usr/share/pkg-config-dpkghook; then /usr/share/pkg-config-dpkghook update; fi
+post-invoke=if { test "$DPKG_HOOK_ACTION" = add-architecture || test "$DPKG_HOOK_ACTION" = remove-architecture; } && test -x /usr/share/pkgconf-dpkghook; then /usr/share/pkgconf-dpkghook update; fi
diff --git a/debian/pkgconf.install b/debian/pkgconf.install
index ddbdbcf..b8a30d3 100644
--- a/debian/pkgconf.install
+++ b/debian/pkgconf.install
@@ -1,3 +1,3 @@
debian/pkg-config-crosswrapper usr/share
-debian/pkg-config-dpkghook usr/share
-debian/pkg-config-hook-config etc/dpkg/dpkg.cfg.d/
+debian/pkgconf-dpkghook usr/share
+debian/pkgconf-hook-config etc/dpkg/dpkg.cfg.d/
diff --git a/debian/postinst b/debian/postinst
index 66fd489..1df5b58 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -5,5 +5,5 @@ set -e
#DEBHELPER#
if test "$1" = configure; then
- /usr/share/pkg-config-dpkghook update
+ /usr/share/pkgconf-dpkghook update
fi
diff --git a/debian/prerm b/debian/prerm
index 853dacb..ea53003 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -5,5 +5,5 @@ set -e
#DEBHELPER#
if test "$1" = remove; then
- /usr/share/pkg-config-dpkghook remove
+ /usr/share/pkgconf-dpkghook remove
fi
diff --git a/debian/rules b/debian/rules
index 582fca5..d8ae50b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ endif
override_dh_auto_install:
dh_auto_install
- chmod +x debian/pkg-config-crosswrapper debian/pkg-config-dpkghook
+ chmod +x debian/pkg-config-crosswrapper debian/pkgconf-dpkghook
echo $(DEB_HOST_MULTIARCH) > debian/pkgconf/usr/lib/pkg-config.multiarch
.PHONY: override_dh_auto_configure override_dh_auto_install
