summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-11-15 16:38:07 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-11-15 16:38:07 -0500
commit12d5b6a10438b5933193b079bb52b2438150ddcb (patch)
tree591ab3090086b702a478c1cdb2aa672ccf3d85e8
parent0d90d120ef7e53091ce536f1a63538e3c98fb132 (diff)
make sure we clean up /var/lib/monkeysphere during prerm.
-rw-r--r--packaging/debian/changelog6
-rwxr-xr-xpackaging/debian/monkeysphere.prerm2
2 files changed, 8 insertions, 0 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.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.