diff options
| author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-08-15 15:04:53 -0700 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-08-15 15:10:02 -0700 |
| commit | 46586fc0f24e24166a52c2a0efb3e2ab838eea81 (patch) | |
| tree | 4e1986278410f4e90e3a5ec70b11b10b14d67220 /debian | |
| parent | cb05f332e617e346aa533d6dde02fb11c6148799 (diff) | |
| parent | c9acc1237d8e21d74fe7070af1b061c888664e8b (diff) | |
Merge commit 'dkg/master'
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b39ba44..64c2a09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ monkeysphere (0.8-1) UNRELEASED; urgency=low of my own. * More monkeysphere-server diagnostics * monkeysphere --gen-subkey now guesses what KeyID you meant. - * set up host-key revocation + * added Recommends: ssh-askpass to ensure monkeysphere --gen-subkey works [ Jameson Graef Rollins ] * fix another bug for when ssh key files are missing. diff --git a/debian/control b/debian/control index 0b3d871..7fbcbc7 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Format: 3.0 (git) Package: monkeysphere Architecture: any Depends: openssh-client, gnupg | gnupg2, coreutils (>= 6), moreutils, lockfile-progs, adduser, ${shlibs:Depends} -Recommends: netcat | socat +Recommends: netcat | socat, ssh-askpass Enhances: openssh-client, openssh-server Description: use the OpenPGP web of trust to verify ssh connections SSH key-based authentication is tried-and-true, but it lacks a true |