fix call to transition script in postinst script, and fix lintian error about transit...

diff --git a/Makefile b/Makefile
index fc608d2717f8453f5c3e3a4909932352c0a9fe90..71df92b935e1d955a0c596da784ed73a564275db 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -54,6 +54,7 @@ install: all installman
        install src/monkeysphere-host src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
        install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
        install -m 0744 src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
+       install -m 0644 src/transitions/README.txt $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
        install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
        install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
        install -m 0644 src/share/ma/* $(DESTDIR)$(PREFIX)/share/monkeysphere/ma

diff --git a/packaging/debian/monkeysphere.postinst b/packaging/debian/monkeysphere.postinst
index efa7fb47fd6c3152e03cd5f1c44f8c378c1e7d62..3d0d66ff1417a365dd9bf0f1b4f2351a75c22bc2 100755 (executable)
--- a/packaging/debian/monkeysphere.postinst
+++ b/packaging/debian/monkeysphere.postinst
@@ -17,8 +17,8 @@ if ! getent passwd monkeysphere >/dev/null ; then
        monkeysphere
 fi
 
-# try to transition from 0.22 to 0.23:
-/usr/share/monkeysphere/transition_0.22_0.23
+# try to transition from to 0.23:
+/usr/share/monkeysphere/transitions/0.23
 
 # setup monkeysphere authentication
 monkeysphere-authentication setup

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 9b31ee09d1c487aacbbd30733c89580b05d39a2d..9e73ad20debd75f516b0b6d82524a05c6bbb5c4b 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -85,8 +85,6 @@ gpg_host_list() {
 }
 
 # command for edit key scripts, takes scripts on stdin
-# FIXME: should we supress all the edit script spew?  or pipe it
-# through log debug?
 gpg_host_edit() {
     gpg_host --command-fd 0 --edit-key "0x${HOST_FINGERPRINT}!" "$@"
 }