Merge tag '0.18'

notmuch 0.18 release

diff --git a/NEWS b/NEWS
index 983db2b57ccf14d0703a1d566bae5984c798b25b..5d85733578492f1ecdde2b2abb2a2d9bdee98976 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-Notmuch 0.18~rc1 (2014-05-04)
-=============================
+Notmuch 0.18 (2014-05-06)
+=========================
 
 Overview
 --------

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index a10ecd93f1a858c68943cbf8073a18031b287b93..c3e96d2efb1749e8c2aee062d13d61fc79b105ed 100644 (file)
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,2 +1,2 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.18~rc1'
+__VERSION__ = '0.18'

diff --git a/debian/changelog b/debian/changelog
index 15fc994e8b9c37670241776221d7a16865c98825..00738a90dcf1f81551e50fe5310796d857cf5cb0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+notmuch (0.18-1) unstable; urgency=medium
+
+  * New upstream release. For detailed release notes see
+    see /usr/share/doc/notmuch/NEWS.gz. Some highlights:
+    - Changes/enhancements to searching for messages by filesystem
+      location ('folder:' and 'path:' prefixes).
+    - Saved searches in Emacs have also been enhanced to allow
+      distinct search orders for each one.
+    - Another enhancement to the Emacs interface is that replies to
+      encrypted messages are now encrypted, reducing the risk of
+      unintentional information disclosure.
+    - The default dump output format has changed to the more robust
+      'batch-tag' format.
+    - The previously deprecated parsing of single message mboxes has
+      been removed.
+
+ -- David Bremner <bremner@debian.org>  Tue, 06 May 2014 16:20:39 +0900
+
 notmuch (0.18~rc1-1) experimental; urgency=low
 
   * Upstream release candidate

diff --git a/version b/version
index 9f565a42af31ef718f964b90f97063afa3bebee3..a4d2aceeb8dbfbe1485a13e51c67dc626bf67a4e 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.18~rc1
+0.18