summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-02-18 12:41:43 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-02-18 12:41:43 -0500
commit41f547adb67c23f87f503edbabedf56fc439b072 (patch)
tree426f3fc1adaf776a7e765e027085fe69cbd54dea
parente3bb810e188cae2d40a5191500a501c85cb93381 (diff)
touching up changelogs as we work toward a 0.29 release.
-rw-r--r--changelog6
-rw-r--r--packaging/debian/changelog4
2 files changed, 6 insertions, 4 deletions
diff --git a/changelog b/changelog
index 8638da6..cba8b4e 100644
--- 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 f52a7ac..164308a 100644
--- 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