Merge branch 'release'

merge 0.23.4 release

NEWS

@@ -1,4 +1,4 @@
-Notmuch 0.23.4 (UNRELEASED)
+Notmuch 0.23.4 (2016-12-24)
 ===========================
 
 Command Line Interface

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'

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

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

version

@@ -1 +1 @@
-0.23.3
+0.23.4