Merge branch 'wheezy'

[debhelper.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 489e539d998cfba2203f97db97c472909d575b99..09c96a46eceffca2eefc0c87548df46504aee571 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.20120609) UNRELEASED; urgency=low
 
   * dh_shlibdeps: Warn if -V flag is passed, to avoid it accidentially being