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

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index bed79ea30eb8b3c7e7553d588eea58a8da45dff4..62f021e4b0adbc4ae256551f54a04015edefefb6 100644 (file)
--- 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 433a0aa123b7345b87bbd14a2d719e3e462c3e54..948bfee06b4cf637bf258108c4bf965542ecd560 100755 (executable)
--- 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.