Merge tag '0.18.1_rc0'

notmuch 0.18.1~rc0 release

diff --git a/NEWS b/NEWS
index 5d85733578492f1ecdde2b2abb2a2d9bdee98976..ec74e6847d89e28e97dd40c588308d8878533ba3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,62 @@
+Notmuch 0.18.1~rc0 (2014-06-22)
+===============================
+
+This is a bug fix and portability release.
+
+Build System
+------------
+
+Add a workaround for systems without zlib.pc.
+
+Make emacs install robust against the non-existence of emacs.
+
+Put notmuch lib directory first in RPATH.
+
+Fix handling of html_static_path in sphinx
+
+  Both the python bindings and the main docs had spurious settings of
+  this variable.
+
+Test Suite
+----------
+
+Use --quick when starting emacs
+
+  This avoids a hang in the T160-json tests.
+
+Allow pending break points in atomicity script
+
+  This allows the atomicity tests to run on several more architectures/OSes.
+
+Command-Line Interface
+----------------------
+
+To improve portability use fsync instead of fdatasync in
+`notmuch-dump`. There should be no functional difference.
+
+Library changes
+---------------
+
+Resurrect support for single-message mbox files
+
+  The removal introduced a bug with previously indexed single-message
+  mboxes.  This support remains deprecated.
+
+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.
+
+Emacs Interface
+---------------
+
+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 c3e96d2efb1749e8c2aee062d13d61fc79b105ed..2f7ae23f147c87dd613e9c618620e47ea7497732 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'
+__VERSION__ = '0.18.1~rc0'

diff --git a/debian/changelog b/debian/changelog
index 3b7e00d7ce63b9a355f20003e1bd17e1b0862b71..3961b0dce179a14f170d3e01e924731357936be9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-notmuch (0.18.1-1) unstable; urgency=medium
+notmuch (0.18.1~rc0-1) experimental; urgency=medium
 
   * New upstream bug fix release
   * Tighten dependence of python packages on libnotmuch

diff --git a/version b/version
index a4d2aceeb8dbfbe1485a13e51c67dc626bf67a4e..4421ee9b0bc7cd317b3ab11c43c9aa2fc9e0cede 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.18
+0.18.1~rc0