Merge commit 'mlcastle/master'

diff --git a/COPYING b/COPYING
index 070c992d3be63fc4c151add26f4ba0be1c87bcae..c4aa4186c54384d20d4c1f25b7c1aabc8324b35e 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -7,7 +7,7 @@ It is free software, developed by:
   Jamie McClelland <jamie@mayfirst.org>
   Micah Anderson <micah@riseup.net>
   Matthew Goins <mjgoins@openflows.com>
-  Mike Castleman <mlcastle@mlcastle.net>
+  Mike Castleman <m@mlcastle.net>
   Elliot Winard <enw@caveteen.com>
   Ross Glover <ross@ross.mayfirst.org>
   Greg Lyle <greg@stealthisemail.com>

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.postrm b/packaging/debian/monkeysphere.postrm
index 8f87ed359dc4f0f95b9c3b5b91cd63657a5d2323..7c0fedea10a2c585743b34edccf908ec859ca632 100755 (executable)
--- 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 433a0aa123b7345b87bbd14a2d719e3e462c3e54..00523a11044a63a45acde2fcd820b74ed4afeee3 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"/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.

diff --git a/website/bugs/useful-information.mdwn b/website/bugs/useful-information.mdwn
new file mode 100644 (file)
index 0000000..0750354
--- /dev/null
+++ b/website/bugs/useful-information.mdwn
@@ -0,0 +1,10 @@
+I would like to know, at INFO (default) log level, when the 
+monkeyspehere makes a "real" modification to my known_hosts file; that 
+is, when it adds or deletes a key.
+
+Apparently this is hard because monkeysphere is currently configured to 
+delete all keys and then add good keys, so a key added for the first 
+time seems to the monkeysphere very similar to a key re-added ten 
+seconds after last login.
+
+Still, from a UI perspective, I want to know what monkeysphere is doing.