Merge commit 'jrollins/master'

[monkeysphere.git] / packaging / debian / changelog

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 873b0587785f389c263c7ea578cb973daeaeaac2..b6592ad7a09ceeb1d5a93992bad69b8fc0276c4f 100644 (file)
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,18 @@
+monkeysphere (0.25-1~pre) UNRELEASED; urgency=low
+
+  * New upstream release:
+    - update/fix the marginal ui output
+    - use msmktempdir everywhere (avoid unwrapped calls to mktemp for
+      portability)
+    - clean out some redundant "cat"s
+    - fix monkeysphere update-known_hosts for sshd running on non-standard
+      ports
+    - add 'sshfpr' subcommand to output the ssh fingerprint of a gpg key
+    - some portability improvements
+  * update Standard-Version to 3.8.1
+
+ -- Jameson Graef Rollins <jrollins@finestructure.net>  Thu, 30 Apr 2009 15:34:28 -0700
+
 monkeysphere (0.24-1) unstable; urgency=low
 
   * New upstream release: