diff options
author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-19 02:33:53 -0500 |
---|---|---|
committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-19 02:33:53 -0500 |
commit | 2ab50bee3f2cc4030cb4555b6c9644e3c206141e (patch) | |
tree | 232e92dce3424be85d8388e8828c5a8024bfcb6c | |
parent | 4bf3771e74fbc352cf385afd6c2ee897e702e45b (diff) |
fix call to transition script in postinst script, and fix lintian error about transitions README
-rwxr-xr-x | Makefile | 1 | ||||
-rwxr-xr-x | packaging/debian/monkeysphere.postinst | 4 | ||||
-rwxr-xr-x | src/monkeysphere-host | 2 |
3 files changed, 3 insertions, 4 deletions
@@ -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 efa7fb4..3d0d66f 100755 --- 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 9b31ee0..9e73ad2 100755 --- 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}!" "$@" } |