summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorMatt Goins <mjgoins@openflows.com>2009-02-21 16:54:39 -0500
committerMatt Goins <mjgoins@openflows.com>2009-02-21 16:54:39 -0500
commit4e0502a242b89c73535b00cc1b199dfea38ce4d4 (patch)
tree6bed970da1f85171b1c0b13095b702825a90754b /packaging
parentd41fe28eb49e42d7773a223a43fd108913410c99 (diff)
parenteb88374be90344d1808fe49a5bc69a547a09280d (diff)
Merge branch 'master' of git://lair.fifthhorseman.net/~dkg/monkeysphere
Diffstat (limited to 'packaging')
-rw-r--r--packaging/debian/changelog17
-rwxr-xr-xpackaging/debian/monkeysphere.prerm2
2 files changed, 11 insertions, 8 deletions
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index fc317d9..32b7388 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -7,21 +7,22 @@ monkeysphere (0.23~pre-1) UNRELEASED; urgency=low
- replace monkeysphere-server with monkeysphere-{authentication,host}
- fold monkeysphere-ssh-proxycommand into /usr/bin/monkeysphere
- * new ability to import existing ssh key into monkeysphere
- * simplify adding a host to the monkeysphere, automate the process
- during debian installation
+ * new ability to import existing ssh host key into monkeysphere. So now
+ m-a import-key replaces m-s gen-key.
* provide pem2openpgp for translating unencrypted PEM-encoded raw key
- material into OpenPGP keys.
- * added better checks for the existence of a host private key for
- functions that require it to be there.
+ material into OpenPGP keys (introduces new perl dependencies)
* get rid of getopts dependency
* added version output option
+ * better checks for the existence of a host private key for
+ monkeysphere-host subcommands that need it.
* better checks on validity of existing authentication subkeys when
- doing monkeysphere {import,gen}_subkey.
+ doing monkeysphere gen_subkey.
* add transition infrastructure for major changes between releases (see
transitions/README.txt)
+ * implement and document two new monkeysphere-host subcommands:
+ revoke-key and add-revoker
- -- Jameson Graef Rollins <jrollins@finestructure.net> Thu, 19 Feb 2009 15:11:04 -0500
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Fri, 20 Feb 2009 12:37:34 -0500
monkeysphere (0.22-1) unstable; urgency=low
diff --git a/packaging/debian/monkeysphere.prerm b/packaging/debian/monkeysphere.prerm
index 1fb2636..5835f53 100755
--- a/packaging/debian/monkeysphere.prerm
+++ b/packaging/debian/monkeysphere.prerm
@@ -5,6 +5,8 @@
# Author: Jameson Rollins <jrollins@finestructure.net>
# Copyright 2008-2009
+true
+
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.