Import Debian version 20090814

diff --git a/debian/changelog b/debian/changelog
index 575fb005b4065398a0440304aa24a40d6d1643fc..f5b0e05a7c5c4c7913810f13ee95b59e70adcd4c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ca-certificates (20090814) unstable; urgency=low
+
+  * Call Debconf and its db_purge as early as possible in postrm.
+    (Closes: #541275)
+
+ -- Philipp Kern <pkern@debian.org>  Fri, 14 Aug 2009 11:10:00 +0200
+
 ca-certificates (20090709) unstable; urgency=low
 
   * Fix purge by checking for `/etc/ssl/certs' first.  (Closes: #536331)

diff --git a/debian/postrm b/debian/postrm
index a397de918ca61c2a85f6a1559e969526cbe653be..9b3c29c7809c5acb039f88466de2c8cb79be9500 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -16,6 +16,14 @@ set -e
 #        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
 # for details, see /usr/share/doc/packaging-manual/
 
+# Clear the debconf database as early as possible and signal debconf that
+# we are done with it.
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
+    . /usr/share/debconf/confmodule
+    db_purge
+    db_stop
+fi
+
 remove_dangling_symlinks() {
     if ! [ -d /etc/ssl/certs ]
     then
@@ -45,10 +53,6 @@ case "$1" in
         [ -d /etc/ssl ] && rmdir --ignore-fail-on-non-empty /etc/ssl
 
         rm -f /etc/ca-certificates.conf*
-        if test -e /usr/share/debconf/confmodule; then
-            . /usr/share/debconf/confmodule
-            db_purge
-        fi
         ;;
 
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

diff --git a/debian/rules b/debian/rules
index 5cbc4c03498607bf398350da752f9f891d888438..c84cdc2d5259ebc17e9be09d2ad1e6c44a687a86 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,7 @@ install: build
 binary-indep: build install
        dh_testdir
        dh_testroot
-       dh_installdebconf       
+       dh_installdebconf -n
        dh_installdocs
        dh_installexamples
        dh_installman sbin/update-ca-certificates.8