Merge branch 'release'

These are the (tentative) changes for 0.23.5
This commit is contained in:
David Bremner 2017-01-08 08:42:26 -04:00
commit b15b96f846
6 changed files with 19 additions and 4 deletions

9
NEWS
View file

@ -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) Notmuch 0.23.4 (2016-12-24)
=========================== ===========================

View file

@ -1,3 +1,3 @@
# this file should be kept in sync with ../../../version # this file should be kept in sync with ../../../version
__VERSION__ = '0.23.4' __VERSION__ = '0.23.5'
SOVERSION = '4' SOVERSION = '4'

2
configure vendored
View file

@ -284,7 +284,7 @@ if [ -z "$LIBDIR" ] ; then
libdir_expanded="${PREFIX}/lib" libdir_expanded="${PREFIX}/lib"
else else
# very non-general variable expansion # 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 fi
cat <<EOF cat <<EOF

6
debian/changelog vendored
View file

@ -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 notmuch (0.23.4-1) unstable; urgency=medium
* Improve error handling in notmuch insert * Improve error handling in notmuch insert

View file

@ -12,7 +12,7 @@ master_doc = 'index'
# General information about the project. # General information about the project.
project = u'notmuch' 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__) location = os.path.dirname(__file__)

View file

@ -1 +1 @@
0.23.4 0.23.5