Merge tag '0.20_rc2'

notmuch 0.20~rc2 release

5 files changed, 67 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 25e5b5a5..eeaf0d4b 100644
--- a/NEWS
+++ b/NEWS
@@ -10,11 +10,66 @@ There is a new `mimetype:` search prefix
   content-type of attachments, which is now indexed. See the
   `notmuch-search-terms` manual page for details.
 
+Path to gpg is now configurable
+
+  On systems with multiple versions of gpg, you can tell
+  notmuch which one to use by setting `crypto.gpg_path`
+
+New command, `notmuch-emacs-mua`
+
+  This new wrapper script is intended to be a drop in replacement for
+  mutt to compose and send mail using `notmuch-emacs`
+
+Emacs
+-----
+
+Avoid rendering large text attachements.
+
+Improved rendering of CID references in HTML.
+
+Vim
+---
+
+Vim client now respects excluded tags.
+
+Notmuch-Mutt
+------------
+
+Support messages without Message-IDs.
+
+Library
+-------
+
+Undeprecate single message mboxes
+
+  It seems more trouble to remove this feature than expected, so
+  `notmuch new` will no longer nag about mboxes with a single message.
+
+New error logging facility
+
+  Clients should call `notmuch_database_status_string` to retrieve
+  output formerly printed to stderr.
+
+Several bug fixes related to stale iterators
+
+New status code returning API for n_query_search_{messages,thread}
+
+Fix for library `install_name` on Mac OS X
+
+Fix for rounding of seconds
+
 Documentation
 -------------
 
-Support for using rst2man in place of sphinx to build the
-docmumentation has been removed.
+Sphinx is now mandatory to build docs
+
+  Support for using rst2man in place of sphinx to build the
+  docmumentation has been removed.
+
+Improved notmuch-search-terms.7
+
+  The man page `notmuch-search-terms(7)` has been extended, merging
+  some material from the relicensed wiki.
 
 Contrib
 -------
diff --git a/bindings/python/notmuch/globals.py b/bindings/python/notmuch/globals.py
index 4c49d51d..70cfdc3d 100644
--- a/bindings/python/notmuch/globals.py
+++ b/bindings/python/notmuch/globals.py
@@ -18,7 +18,7 @@ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
 
 from ctypes import CDLL, Structure, POINTER
-from version import SOVERSION
+from notmuch.version import SOVERSION
 
 #-----------------------------------------------------------------------------
 #package-global instance of the notmuch library
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 4d5230f4..0377dae1 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.20~rc1'
+__VERSION__ = '0.20~rc2'
 SOVERSION = '4'
diff --git a/debian/changelog b/debian/changelog
index 3edff946..b0d035ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.20~rc2-1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Fix breakage of python bindings under python3
+
+ -- David Bremner <bremner@debian.org>  Sat, 23 May 2015 21:05:03 +0200
+
 notmuch (0.20~rc1-1) experimental; urgency=medium
 
   * New upstream release candidate
diff --git a/version b/version
index 97e69085..fa9b0efe 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.20~rc1
+0.20~rc2