From: David Bremner <david@tethera.net>
Date: Wed, 28 Dec 2016 23:41:20 +0000 (+0900)
Subject: Merge branch 'release'
X-Git-Tag: 0.24_rc0~56
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=11064124732961f6fcfd78226ebaba0abed2c8fe;hp=f2a038825b73d4b9fa6cfd3ecbe661f1e6a49840

Merge branch 'release'

merge 0.23.4 release
---

diff --git a/NEWS b/NEWS
index a7d4c205..8125e09f 100644
--- 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 98ea31b5..b5d308e2 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.23.3'
+__VERSION__ = '0.23.4'
 SOVERSION = '4'
diff --git a/debian/changelog b/debian/changelog
index 9c2ebf75..18788d86 100644
--- 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 15710a89..a915179b 100755
--- 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 9e40e75c..40a6dfed 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.23.3
+0.23.4