dh_installcatalogs: Adjust catalog conffile conversion to avoid dpkg conffile prompt...

diff --git a/autoscripts/preinst-sgmlcatalog b/autoscripts/preinst-sgmlcatalog
index 41f55d6ddfdc5f066c2e86217dfdeb9909ee6610..96f06738bd0c0ce36daee300aedd37a270512b3a 100644 (file)
--- a/autoscripts/preinst-sgmlcatalog
+++ b/autoscripts/preinst-sgmlcatalog
@@ -1,7 +1,8 @@
-if [ "$1" = "upgrade" ] && ! dpkg-query -S #CENTRALCAT# >/dev/null 2>&1; then
+if test -f #CENTRALCAT# -a "(" "$1" = "upgrade" -o "$1" = "install" -a -n "$2" ")" && 
+               ! dpkg-query -S #CENTRALCAT# >/dev/null 2>&1; then
        # If the dpkg-query command returns non-zero, the central catalog is
        # not owned by any package. This is due to an old behaviour of
        # debhelper. Now that file becomes a conffile. In order to avoid a
        # question during installation, we remove the old non-conffile.
-       rm -f #CENTRALCAT#
+       mv #CENTRALCAT# #CENTRALCAT#.old
 fi

diff --git a/debian/changelog b/debian/changelog
index 0bb44d67755976525758c5eab4409ad64a95a540..b4d4824d60983154606657314f00a98e51a81c15 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (9.20120830) unstable; urgency=low
+
+  * dh_installcatalogs: Adjust catalog conffile conversion to avoid
+    dpkg conffile prompt when upgrading from a removed package.
+    Closes: #681194
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 30 Aug 2012 11:04:10 -0400
+
 debhelper (9.20120608) unstable; urgency=low
 
   * dh: When there's an -indep override target without -arch, or vice versa,