From: David Bremner <david@tethera.net>
Date: Sat, 7 Apr 2018 20:43:01 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.27_rc0~47
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=5d510221d17862a252955d98046508bebcd14573;hp=c117306f2dfcdf705ef3433962d227d1cb39eb90;p=notmuch

Merge branch 'release'
---

diff --git a/NEWS b/NEWS
index 17dba019..fff8a08c 100644
--- 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 bc246330..f125302e 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.26'
+__VERSION__ = '0.26.1'
 SOVERSION = '5'
diff --git a/debian/changelog b/debian/changelog
index 28c8f636..4e6cda69 100644
--- 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 7275d270..4db28a05 100644
--- 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 99222150..30f6cf8d 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.26
+0.26.1