diff options
author | Michael Shuler <michael@pbandjelly.org> | 2011-09-17 17:30:01 -0500 |
---|---|---|
committer | Michael Shuler <michael@pbandjelly.org> | 2011-09-17 17:30:01 -0500 |
commit | 556012bf94c15c5f90df37bca737f972a04223d2 (patch) | |
tree | 602979707718af61578cf195865edab7aa918470 | |
parent | b76d253d5db9a66ac369774097a04418490ed95a (diff) | |
download | ca-certificates-556012bf94c15c5f90df37bca737f972a04223d2.tar.gz |
Import Debian version 20090814debian/20090814
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/postrm | 12 | ||||
-rwxr-xr-x | debian/rules | 2 |
3 files changed, 16 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 575fb00..f5b0e05 100644 --- 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 a397de9..9b3c29c 100644 --- 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 5cbc4c0..c84cdc2 100755 --- 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 |