Merge commit 'dkg/master'

[monkeysphere.git] / packaging / debian / changelog

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index e8ea1a9e4453c35ab619a983931b458a7348270e..3b7432bd4870ffc82b17e7bba2fb0407a2f1d6a4 100644 (file)
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,11 +1,19 @@
-monkeysphere (0.22-1) UNRELEASED; urgency=low
+monkeysphere (0.22~pre-1) UNRELEASED; urgency=low
 
   * New upstream release:
+  [ Jameson Rollins ]
+
     - added info log output when a new key is added to known_hosts file.
     - added some useful output to the ssh-proxycommand for "marginal"
       cases where keys are found for host but do not have full validity.
 
- -- Jameson Graef Rollins <jrollins@finestructure.net>  Sun, 16 Nov 2008 03:17:16 -0500
+  [ Daniel Kahn Gillmor ]
+
+    - automatically output two copies of the host's public key: one
+    standard ssh public key file, and the other a minimal OpenPGP key with
+    just the latest valid self-sig.
+
+ -- Jameson Graef Rollins <jrollins@finestructure.net>  Sun, 16 Nov 2008 03:22:08 -0500
 
 monkeysphere (0.21-2) unstable; urgency=low