aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2018-04-07 17:43:01 -0300
committerDavid Bremner <david@tethera.net>2018-04-07 17:43:01 -0300
commit5d510221d17862a252955d98046508bebcd14573 (patch)
tree5f4da0e791511fc12c8511e172d1530999322bb4
parentc117306f2dfcdf705ef3433962d227d1cb39eb90 (diff)
parentea690a44d1a5af3da496b0d9482471cbd9623231 (diff)
Merge branch 'release'
-rw-r--r--NEWS10
-rw-r--r--bindings/python/notmuch/version.py2
-rw-r--r--debian/changelog6
-rw-r--r--lib/notmuch.h2
-rw-r--r--version2
5 files changed, 19 insertions, 3 deletions
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