Merge branch 'release'

merge 0.23.4 release

diff --git a/NEWS b/NEWS
index a7d4c205a99b97089e0b7a5adc29238d75e0a3a8..8125e09f477de50915ba0d54115abefb72c7766e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Notmuch 0.23.4 (UNRELEASED)
+Notmuch 0.23.4 (2016-12-24)
 ===========================
 
 Command Line Interface

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 98ea31b56b7ceef6024613d541127167ca9fca67..b5d308e2ab83d465f2810fb83a69c43ccf25c317 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.23.3'
+__VERSION__ = '0.23.4'
 SOVERSION = '4'

diff --git a/debian/changelog b/debian/changelog
index 9c2ebf7525c4dd39b8ce3aeeedef5e7d1428ee8c..18788d8672324c0bd298bb8bd65c391cb67fb44f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.23.4-1) unstable; urgency=medium
+
+  * Improve error handling in notmuch insert
+  * Restore autoload cookie for notmuch-search (notmuch-emacs)
+
+ -- David Bremner <bremner@debian.org>  Sat, 24 Dec 2016 17:47:48 +0900
+
 notmuch (0.23.3-3) unstable; urgency=medium
 
   * Disable gdb using tests on kfreebsd-*, due to apparent gdb breakage

diff --git a/debian/rules b/debian/rules
index 15710a895946b79e59bd7c24fba27ea12dbdf65a..a915179b600717e13610d2c738fed7e61a798370 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,7 @@ override_dh_auto_configure:
                --mandir=/usr/share/man \
                --infodir=/usr/share/info \
                --sysconfdir=/etc \
-               --localstatedir=/var \
-               --emacslispdir=/usr/share/emacs/site-lisp/notmuch
+               --localstatedir=/var
 
 override_dh_auto_build:
        dh_auto_build -- V=1

diff --git a/version b/version
index 9e40e75c5d2a4d09d4c51c1e13101816d7209157..40a6dfede5db8965ee31ceae3d85bfa12bae3326 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.23.3
+0.23.4