From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 15 Nov 2008 21:38:07 +0000 (-0500)
Subject: make sure we clean up /var/lib/monkeysphere during prerm.
X-Git-Tag: monkeysphere_0.21-2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=12d5b6a10438b5933193b079bb52b2438150ddcb;p=monkeysphere.git

make sure we clean up /var/lib/monkeysphere during prerm.
---

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.prerm b/packaging/debian/monkeysphere.prerm
index 433a0aa..948bfee 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"/monkeysphere/gnupg-host || true
+rmdir --ignore-fail-on-non-empty "$VARLIB"/monkeysphere/gnupg-authentication || true
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.