touching up changelogs as we work toward a 0.29 release.

diff --git a/changelog b/changelog
index 8638da674cca1b2f074f8e89d73eef1b5befd657..cba8b4ee2fe830201e8b4b65a7a1fa08b587b433 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,8 +1,10 @@
-monkeysphere (0.28.1) unstable; urgency=low
+monkeysphere (0.29~pre1) UNRELEASED; urgency=low
 
   * Fix man page typo about monkeysphere authorized_keys location
+  * Monkeysphere should work properly even if the user has "armor" in
+    their gpg.conf (closes MS #1625)
 
- -- Jameson Graef Rollins <jrollins@finestructure.net>  Thu, 04 Feb 2010 11:57:45 -0500
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 18 Feb 2010 12:38:43 -0500
 
 monkeysphere (0.28) unstable; urgency=low
 

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index f52a7ac8db073e75e2e2e4370795e166d12f49b6..164308a606b32d2353a4df8259a31e7d0dff0048 100644 (file)
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,4 +1,4 @@
-monkeysphere (0.28.1-1~pre1) UNRELEASED; urgency=low
+monkeysphere (0.29~pre1-1) UNRELEASED; urgency=low
 
   [ Jameson Graef Rollins ]
   * New upstream release
@@ -6,7 +6,7 @@ monkeysphere (0.28.1-1~pre1) UNRELEASED; urgency=low
   [ Daniel Kahn Gillmor ]
   * bumped Standards-Version to 3.8.4 (no changes needed)
 
- -- Jameson Graef Rollins <jrollins@finestructure.net>  Thu, 04 Feb 2010 12:00:58 -0500
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 18 Feb 2010 12:40:56 -0500
 
 monkeysphere (0.28-1) unstable; urgency=low