Merge commit 'mlcastle/master'

3 files changed, 8 insertions, 1 deletions

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index bed79ea..62f021e 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,9 @@
+monkeysphere (0.21-2) unstable; urgency=low
+
+  * actually rmdir /var/lib/monkeysphere-* during prerm if possible.
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Sat, 15 Nov 2008 16:36:57 -0500
+
 monkeysphere (0.21-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/packaging/debian/monkeysphere.postrm b/packaging/debian/monkeysphere.postrm
index 8f87ed3..7c0fede 100755
--- a/packaging/debian/monkeysphere.postrm
+++ b/packaging/debian/monkeysphere.postrm
@@ -7,7 +7,6 @@
 
 case $1 in
     purge)
-        rmdir --ignore-fail-on-non-empty /var/lib/monkeysphere || true
         echo "removing monkeysphere user..."
         userdel monkeysphere > /dev/null || true
         ;;
diff --git a/packaging/debian/monkeysphere.prerm b/packaging/debian/monkeysphere.prerm
index 433a0aa..00523a1 100755
--- a/packaging/debian/monkeysphere.prerm
+++ b/packaging/debian/monkeysphere.prerm
@@ -9,6 +9,8 @@ VARLIB="/var/lib/monkeysphere"
 
 rm -f "$VARLIB"/gnupg-host/gpg.conf
 rm -f "$VARLIB"/gnupg-authentication/gpg.conf
+rmdir --ignore-fail-on-non-empty "$VARLIB"/gnupg-host
+rmdir --ignore-fail-on-non-empty "$VARLIB"/gnupg-authentication
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.