diff options
| author | Matt Goins <mjgoins@openflows.com> | 2008-06-25 01:59:19 -0400 |
|---|---|---|
| committer | Matt Goins <mjgoins@openflows.com> | 2008-06-25 01:59:19 -0400 |
| commit | 43097e923b8051ecd0912e367c1cd78149a97dbe (patch) | |
| tree | e0553c718ea443a9f7f08a50c6ef1f7c9a9d953a /debian | |
| parent | c1a5568ee2f6c46501df057a71f23681ea0194ec (diff) | |
| parent | e0b50e3859931c7fe2a58bb08af440a4f2455174 (diff) | |
Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 30 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/dirs | 4 | ||||
| -rw-r--r-- | debian/monkeysphere.dirs | 4 |
4 files changed, 33 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 41af80c..82f274a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,31 @@ -monkeysphere (0.2-1) UNRELEASED; urgency=low +monkeysphere (0.4-1) UNRELEASED; urgency=low + + [Daniel Kahn Gillmor] + * New version (switch UNRELEASED to experimental when ready) + + -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net> Tue, 24 Jun 2008 01:25:45 -0400 + +monkeysphere (0.3-1) experimental; urgency=low + + [ Daniel Kahn Gillmor ] + * new version. + + [ Jameson Graef Rollins ] + * Move files in /var/cache/monkeysphere and GNUPGHOME for server to + the more appropriate /var/lib/monkeysphere. + + -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net> Tue, 24 Jun 2008 00:55:29 -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 ] - * NOT YET RELEASED (switch to "experimental" when ready to release) + * openpgp2ssh now supports specifying keys by full fingerprint. [ Jameson Graef Rollins ] * Add AUTHORIZED_USER_IDS config variable for server, which defaults to @@ -14,7 +38,7 @@ monkeysphere (0.2-1) UNRELEASED; urgency=low * Better failure/prompting for gen-subkey * Add ability to set any owner trust level for keys in server keychain. - -- Jameson Graef Rollins <jrollins@phys.columbia.edu> Sun, 22 Jun 2008 11:42:42 -0400 + -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net> Mon, 23 Jun 2008 17:03:19 -0400 monkeysphere (0.1-1) experimental; urgency=low diff --git a/debian/control b/debian/control index d4d25c6..4f0e5f5 100644 --- a/debian/control +++ b/debian/control @@ -3,14 +3,14 @@ Section: net Priority: extra Maintainer: Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net> Uploaders: Jameson Rollins <jrollins@fifthhorseman.net> -Build-Depends: debhelper (>= 7.0), libgnutls-dev (>= 2.3.14) +Build-Depends: debhelper (>= 7.0), libgnutls-dev (>= 2.4.0) Standards-Version: 3.8.0.1 Homepage: http://cmrg.fifthhorseman.net/wiki/OpenPGPandSSH 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 diff --git a/debian/dirs b/debian/dirs index b458649..43b742a 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,5 +1,5 @@ -var/cache/monkeysphere -var/cache/monkeysphere/authorized_keys +var/lib/monkeysphere +var/lib/monkeysphere/authorized_keys usr/bin usr/sbin usr/share diff --git a/debian/monkeysphere.dirs b/debian/monkeysphere.dirs index 6e90899..b0b2d9c 100644 --- a/debian/monkeysphere.dirs +++ b/debian/monkeysphere.dirs @@ -1,4 +1,4 @@ usr/share/monkeysphere -var/cache/monkeysphere -var/cache/monkeysphere/authorized_keys +var/lib/monkeysphere +var/lib/monkeysphere/authorized_keys etc/monkeysphere |