Merge branch 'release'

These are the (tentative) changes for 0.23.5

diff --git a/NEWS b/NEWS
index 8125e09f477de50915ba0d54115abefb72c7766e..7d63462172a8ccc3ce41c523365ea77bcadf4698 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Notmuch 0.23.5 (UNRELEASED)
+===========================
+
+Build system
+------------
+
+Fix quoting bug in configure. This had introduced a RUNPATH into the
+notmuch binary in cases where it was not not needed.
+
 Notmuch 0.23.4 (2016-12-24)
 ===========================
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index b5d308e2ab83d465f2810fb83a69c43ccf25c317..1397fefd1333cebcc0798537b89a01c8f698650b 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.4'
+__VERSION__ = '0.23.5'
 SOVERSION = '4'

diff --git a/configure b/configure
index 72db26dfc52e6ae287bebe96c03e2e38e4d27f34..ddfbbabfe4820f178fe00b592d2a22ac7a6ad284 100755 (executable)
--- a/configure
+++ b/configure
@@ -284,7 +284,7 @@ if [ -z "$LIBDIR" ] ; then
     libdir_expanded="${PREFIX}/lib"
 else
     # very non-general variable expansion
-    libdir_expanded=$(echo "$LIBDIR" | sed "s|\\${prefix}|${PREFIX}|g; s|\\$prefix/|${PREFIX}/|; s|//*|/|g")
+    libdir_expanded=$(printf %s "$LIBDIR" | sed "s|\${prefix}|${PREFIX}|; s|\$prefix\>|${PREFIX}|; s|//*|/|g")
 fi
 
 cat <<EOF

diff --git a/debian/changelog b/debian/changelog
index 18788d8672324c0bd298bb8bd65c391cb67fb44f..8d82049f9070ece0dc9e623bac057c52725e52b2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.23.5-1) unstable; urgency=medium
+
+  * Remove RUNPATH from /usr/bin/notmuch
+
+ -- David Bremner <bremner@debian.org>  Sun, 08 Jan 2017 08:31:03 -0400
+
 notmuch (0.23.4-1) unstable; urgency=medium
 
   * Improve error handling in notmuch insert

diff --git a/doc/conf.py b/doc/conf.py
index b6cfa1aa3499d468d3fb7f8f22661a2375b0e75a..a3d8269696a366dca12b1caa4a8d67e6005d993c 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -12,7 +12,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'notmuch'
-copyright = u'2009-2016, Carl Worth and many others'
+copyright = u'2009-2017, Carl Worth and many others'
 
 location = os.path.dirname(__file__)
 

diff --git a/version b/version
index 40a6dfede5db8965ee31ceae3d85bfa12bae3326..f6de00174468ba8adbdb9efb8bec427f2709c2ac 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.23.4
+0.23.5