summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-08-30 12:01:41 -0400
committerJoey Hess <joey@kitenet.net>2012-08-30 12:01:41 -0400
commitb29cdafefe70aaeee919305543466abca09bcd4b (patch)
treea4899a5a081dfb4bcbc586ddb82dee67d78969d8
parent00250d8cd20a37be362850d3ed8a652b0768455f (diff)
parentb3c00de156adf9c52da3cd0fa7c46414d5eb6982 (diff)
Merge branch 'wheezy'
-rw-r--r--autoscripts/preinst-sgmlcatalog5
-rw-r--r--debian/changelog8
2 files changed, 11 insertions, 2 deletions
diff --git a/autoscripts/preinst-sgmlcatalog b/autoscripts/preinst-sgmlcatalog
index 41f55d6..96f0673 100644
--- 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 489e539..09c96a4 100644
--- 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.20120609) UNRELEASED; urgency=low
* dh_shlibdeps: Warn if -V flag is passed, to avoid it accidentially being