From: David Bremner <david@tethera.net>
Date: Mon, 6 Mar 2017 00:32:20 +0000 (-0400)
Subject: Merge tag '0.24_rc0'
X-Git-Tag: 0.25_rc0~141
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=91524d5d6cafbab1c1d6bc5a75b02c4d86689e3b;hp=85df8b3915159fa94b7c1c32cb54eda8bd92e0e0

Merge tag '0.24_rc0'

notmuch 0.24~rc0 release
---

diff --git a/NEWS b/NEWS
index 7f25ca79..652affa9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,32 @@
+Notmuch 0.24 (UNRELEASED)
+=========================
+
+General
+-------
+
+Regular expression searches supported for `from:` and `subject:`.
+
+  This requires recent Xapian (1.4+) See notmuch-search-terms(7) for
+  details.
+
+Emacs Interface
+---------------
+
+  Save and resume messages in `notmuch-message-mode` (composition).
+
+Library changes
+---------------
+
+`notmuch_query_count_messages` is now non-destructive.
+
+  Internally the implementation of excludes has changed to make this
+  possible.
+
+Improved handling of DatabaseModifiedError
+
+  Previously uncaught exceptions reading message metadata are now
+  handled.
+
 Notmuch 0.23.7 (2017-02-28)
 ===========================
 
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index e1a49522..43071028 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.23.7'
+__VERSION__ = '0.24~rc0'
 SOVERSION = '4'
diff --git a/debian/changelog b/debian/changelog
index f3167549..3781acf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.24~rc0-1) experimental; urgency=medium
+
+  * New upstream feature release (candidate).
+
+ -- David Bremner <bremner@debian.org>  Sun, 05 Mar 2017 19:32:08 -0400
+
 notmuch (0.23.7-1) unstable; urgency=medium
 
   * Move test suite $GNUPGHOME to /tmp to avoid problems with long build paths.
diff --git a/debian/libnotmuch4.symbols b/debian/libnotmuch4.symbols
index c8a94ba6..9bfec1a1 100644
--- a/debian/libnotmuch4.symbols
+++ b/debian/libnotmuch4.symbols
@@ -113,10 +113,14 @@ libnotmuch.so.4 libnotmuch4 #MINVER#
  (c++)"typeinfo for Xapian::DocNotFoundError@Base" 0.6.1
  (c++)"typeinfo for Xapian::InvalidArgumentError@Base" 0.6.1
  (c++)"typeinfo for Xapian::Error@Base" 0.6.1
+ (c++)"typeinfo for Xapian::DatabaseError@Base" 0.24~rc0
+ (c++)"typeinfo for Xapian::DatabaseModifiedError@Base" 0.24~rc0
  (c++|optional=present with Xapian 1.4)"typeinfo for Xapian::QueryParserError@Base" 0.23~rc0
  (c++)"typeinfo name for Xapian::LogicError@Base" 0.6.1
  (c++)"typeinfo name for Xapian::RuntimeError@Base" 0.6.1
  (c++)"typeinfo name for Xapian::DocNotFoundError@Base" 0.6.1
  (c++)"typeinfo name for Xapian::InvalidArgumentError@Base" 0.6.1
  (c++)"typeinfo name for Xapian::Error@Base" 0.6.1
+ (c++)"typeinfo name for Xapian::DatabaseError@Base" 0.24~rc0
+ (c++)"typeinfo name for Xapian::DatabaseModifiedError@Base" 0.24~rc0
  (c++|optional=present with Xapian 1.4)"typeinfo name for Xapian::QueryParserError@Base" 0.23~rc0
diff --git a/version b/version
index 379191a4..ab10aa0f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.23.7
+0.24~rc0