Merge tag '0.25_rc0'

notmuch 0.25~rc0 release

diff --git a/NEWS b/NEWS
index 5b28c9088f40b38074f49ed65941d98ebc10d0ec..7e552a1b99e99598c12022f68b1b6f2981acbecf 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Notmuch 0.25 (UNRELEASED)
+=========================
+
 Notmuch 0.24.2 (2017-06-01)
 ===========================
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 6101902b8ecd20a8a79af1cb77cc4d189fe83d35..aa4a6b63faeb55f8c91f6578792845caca1e63dc 100644 (file)
--- 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.24.2'
+__VERSION__ = '0.25~rc0'
 SOVERSION = '5'

diff --git a/debian/changelog b/debian/changelog
index f023d6e34aacf88bf6da8ee13f8256b1e84ef0cf..f02f21328996c6d393d95fda3f11f7ffe1be6894 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-notmuch (0.24.2-3) UNRELEASED; urgency=medium
+notmuch (0.25~rc0-1) experimental; urgency=medium
 
+  * New upstream release candidate
   * Drop notmuch-dbg, use notmuch-dbgsym if debug symbols are needed.
+  * [lib] Bump SONAME to libnotmuch.so.5
+  * Bug fix: "doesn't check gpg/pgp signatures by default", thanks
+    to Vagrant Cascadian (Closes: #755544).
+  * Bug fix: "allow separation of command-line options and their
+    values: --option foo", thanks to Paul Wise (Closes: #825886).
 
- -- David Bremner <bremner@debian.org>  Thu, 06 Jul 2017 08:35:09 -0300
+ -- David Bremner <bremner@debian.org>  Sun, 16 Jul 2017 08:48:59 -0300
 
 notmuch (0.24.2-2) unstable; urgency=medium
 

diff --git a/debian/libnotmuch5.symbols b/debian/libnotmuch5.symbols
index 9f3323ffc225659bc651b7986445d2572f8d3adb..716d3b86a699e1f6eca71f32a45440575ef52baf 100644 (file)
--- a/debian/libnotmuch5.symbols
+++ b/debian/libnotmuch5.symbols
@@ -116,6 +116,8 @@ libnotmuch.so.5 libnotmuch5 #MINVER#
  (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 for Xapian::QueryParser::add_valuerangeprocessor(Xapian::ValueRangeProcessor*)::ShimRangeProcessor@Base" 0.25~rc0
+ (c++)"typeinfo name for Xapian::QueryParser::add_valuerangeprocessor(Xapian::ValueRangeProcessor*)::ShimRangeProcessor@Base" 0.25~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

diff --git a/debian/notmuch.dirs b/debian/notmuch.dirs
index a23e43d942aec499f9b0634db83b86df3352a6a2..e77248175524d9f63749c2d6ca67159eeb4aa635 100644 (file)
--- a/debian/notmuch.dirs
+++ b/debian/notmuch.dirs
@@ -1,2 +1 @@
 usr/bin
-etc/bash_completion.d

diff --git a/version b/version
index 8b95abd9483e5ec2c932da88c141b56dc1f2b550..ea0647b78550d59481661ec112819ba4bc512399 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.24.2
+0.25~rc0