diff options
| author | Jamie McClelland <jm@mayfirst.org> | 2008-09-06 02:59:12 -0400 |
|---|---|---|
| committer | Jamie McClelland <jm@mayfirst.org> | 2008-09-06 02:59:12 -0400 |
| commit | 2c6c9e84ef5417987d90d45d28be6894df5afe35 (patch) | |
| tree | 1d3b746631e364a9e54f66d95671307774846691 /debian | |
| parent | 98253f5bca3f6745ab74a2d0e39109f32e7b173c (diff) | |
| parent | d4d83e34a65cbb3be4b46da590297f326e660052 (diff) | |
Merge commit 'dkg/master'
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 d032017..6acb8e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -monkeysphere (0.15~pre-1) UNRELEASED; urgency=low +monkeysphere (0.15-1) experimental; urgency=low * porting work and packaging simplification: clarifying makefiles, pruning dependencies, etc. diff --git a/debian/control b/debian/control index ef62798..8f5aeef 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Dm-Upload-Allowed: yes Package: monkeysphere Architecture: any -Depends: openssh-client, gnupg | gnupg2, coreutils (>= 6), lockfile-progs, adduser, ${shlibs:Depends} +Depends: openssh-client, gnupg, coreutils (>= 6) | base64, lockfile-progs | procfile, adduser, ${shlibs:Depends} Recommends: netcat | socat, ssh-askpass Enhances: openssh-client, openssh-server Description: use the OpenPGP web of trust to verify ssh connections |