Merge tag '0.18.1'

notmuch 0.18.1 release

4 files changed, 20 insertions, 12 deletions

diff --git a/NEWS b/NEWS
index ec74e684..eb8174cd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,16 +1,16 @@
-Notmuch 0.18.1~rc0 (2014-06-22)
-===============================
+Notmuch 0.18.1 (2014-06-25)
+===========================
 
 This is a bug fix and portability release.
 
 Build System
 ------------
 
-Add a workaround for systems without zlib.pc.
+Add a workaround for systems without zlib.pc
 
-Make emacs install robust against the non-existence of emacs.
+Make emacs install robust against the non-existence of emacs
 
-Put notmuch lib directory first in RPATH.
+Put notmuch lib directory first in RPATH
 
 Fix handling of html_static_path in sphinx
 
@@ -44,9 +44,9 @@ Resurrect support for single-message mbox files
 
 Fix for phrase indexing
 
-  There were several bugs involving overlapping "phrases" accross
-  header and mime part boundaries.  This fix will effect only newly
-  (re)-indexed messages.
+  There were several bugs where words intermingled from different
+  headers and MIME parts could match a single phrase query.  This fix
+  will affect only newly indexed messages.
 
 Emacs Interface
 ---------------
@@ -56,7 +56,6 @@ Make sure tagging on an empty query is harmless
   Previously tagging an empty query could lead to tags being
   unintentionally removed.
 
-
 Notmuch 0.18 (2014-05-06)
 =========================
 
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 2f7ae23f..40f3e889 100644
--- 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.1~rc0'
+__VERSION__ = '0.18.1'
diff --git a/debian/changelog b/debian/changelog
index 3961b0dc..f873b1b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,15 @@
-notmuch (0.18.1~rc0-1) experimental; urgency=medium
+notmuch (0.18.1-1) unstable; urgency=medium
 
   * New upstream bug fix release
+    - Re-enable support for single-message mbox files
+    - Fix for phrase indexing
+    - Make tagging empty query in Emacs harmless
+
+ -- David Bremner <bremner@debian.org>  Wed, 25 Jun 2014 07:20:45 -0300
+
+notmuch (0.18.1~rc0-1) experimental; urgency=medium
+
+  * New upstream bug fix release (candidate)
   * Tighten dependence of python packages on libnotmuch
     (Closes: #749881).
   * Redo emacsen-install script from sample in emacsen-common
diff --git a/version b/version
index 4421ee9b..249afd51 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.18.1~rc0
+0.18.1