diff options
author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-06-23 22:35:31 -0400 |
---|---|---|
committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-06-23 22:35:31 -0400 |
commit | 014bf21eae8b5358d0fc10c92c065e5a5deadab5 (patch) | |
tree | df575de2bbdf816bee79f62a4deecb5978a4210a /debian | |
parent | 0f1c6ac9c3c18a46720a8b96854a6624f3a1b8df (diff) | |
parent | 412bf3ca5f34a8e90f0201209e3ec63bf9309a20 (diff) |
Merge commit 'dkg/master'
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 13 | ||||
-rw-r--r-- | debian/control | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index d3d7d9b..9807c8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +monkeysphere (0.3-1) UNRELEASED; urgency=low + + [ Daniel Kahn Gillmor ] + * new version (above: change UNRELEASED to experimental when releasing) + + -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net> Mon, 23 Jun 2008 19:58:47 -0400 + +monkeysphere (0.2-2) experimental; urgency=low + + * added lockfile-progs dependency + + -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net> Mon, 23 Jun 2008 19:34:05 -0400 + monkeysphere (0.2-1) experimental; urgency=low [ Daniel Kahn Gillmor ] diff --git a/debian/control b/debian/control index 85b2d3f..4f0e5f5 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Dm-Upload-Allowed: yes Package: monkeysphere Architecture: any -Depends: openssh-client, gnupg | gnupg2, coreutils (>= 6), moreutils, ${shlibs:Depends} +Depends: openssh-client, gnupg | gnupg2, coreutils (>= 6), moreutils, lockfile-progs, ${shlibs:Depends} Recommends: netcat Enhances: openssh-client, openssh-server Description: use the OpenPGP web of trust to verify ssh connections |