X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=debian%2Fchangelog;h=aa10a2dc37023907f4af87f37eaae2c693dfe3ce;hp=1641fb570389741020e86a363308bdad9f19f157;hb=a77cbe3c919a4939263c2ed50125f33acf105f47;hpb=3f777b2ac2075595c60842da0b7057a36629dc74

diff --git a/debian/changelog b/debian/changelog
index 1641fb57..aa10a2dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,32 @@
-notmuch (0.6~264) UNRELEASED; urgency=low
+notmuch (0.6.1-1) unstable; urgency=low
 
-  * New snapshot, in progress
+  * Properly install README.Debian in notmuch-vim (Closes: #632992).
+    Thanks to Jason Woofenden for the report.
+  * Force notmuch to depend on the same version of libnotmuch. Thanks to
+    Uwe Kleine-König for the patch.
+
+ -- David Bremner <bremner@debian.org>  Sun, 10 Jul 2011 09:34:02 -0300
+
+notmuch (0.6) unstable; urgency=low
+
+  * New upstream release; see /usr/share/doc/notmuch/NEWS for
+    details. Hilights include:
+    - Folder-based search (Closes: #597222)
+    - PGP/MIME decryption and verification
+  * Document strict dependency on emacs23 (Closes: #631994).
+
+ -- David Bremner <bremner@debian.org>  Fri, 01 Jul 2011 11:45:22 -0300
+
+notmuch (0.6~rc1) experimental; urgency=low
+
+  * Git snapshot 3f777b2
+  * Upstream release candidate.
   * Fix description of notmuch-vim to mention vim, not emacs
     (Closes: #631974)
   * Install zsh completion as an example instead of into /usr/share/zsh to
     avoid file conflict with zsh.
 
- -- David Bremner <bremner@debian.org>  Thu, 30 Jun 2011 08:44:27 -0300
+ -- David Bremner <bremner@debian.org>  Thu, 30 Jun 2011 10:02:05 -0300
 
 notmuch (0.6~254) experimental; urgency=low