Merge branch 'release'

diff --git a/NEWS b/NEWS
index 17dba0194344049b9323c2344ad866e430fa3ddb..fff8a08c6acc3244aa9aa3a38f374badd6d31eda 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+Notmuch 0.26.1 (2018-04-02)
+===========================
+
+Library Changes
+---------------
+
+Bump the library minor version. This should have happened in 0.26, but
+better late than never.
+
+
 Notmuch 0.26 (2018-01-09)
 =========================
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index bc246330551462f8a71c00c916d93a85bdcf21c4..f125302e8342986cf5029ff72e49ba6ee173dcef 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.26'
+__VERSION__ = '0.26.1'
 SOVERSION = '5'

diff --git a/debian/changelog b/debian/changelog
index 28c8f636d54311a630bf5ca2c201b9f4f1085723..4e6cda69976eaaafe62450fcba1bdbfb7e9900c6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.26.1-1) unstable; urgency=medium
+
+  * Bump LIBRARY_MINOR_VERSION to 1, for new functions in 0.26
+
+ -- David Bremner <bremner@debian.org>  Mon, 02 Apr 2018 08:08:01 -0300
+
 notmuch (0.26-1) unstable; urgency=medium
 
   [ Daniel Kahn Gillmor ]

diff --git a/lib/notmuch.h b/lib/notmuch.h
index 7275d27000a57224694dfe21afab07a3258d456d..4db28a051e9f8f10c64045c617faf5e0914b05ba 100644 (file)
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -58,7 +58,7 @@ NOTMUCH_BEGIN_DECLS
  * version in Makefile.local.
  */
 #define LIBNOTMUCH_MAJOR_VERSION       5
-#define LIBNOTMUCH_MINOR_VERSION       0
+#define LIBNOTMUCH_MINOR_VERSION       1
 #define LIBNOTMUCH_MICRO_VERSION       0
 
 

diff --git a/version b/version
index 9922215085ae1ebb02ba2be5498c1cce29196e32..30f6cf8d98ce368a5785a337faee8d4fcf904cee 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.26
+0.26.1