Merge tag '0.27_rc1'

notmuch 0.27~rc1 release

diff --git a/NEWS b/NEWS
index a5eb643964dcad9b14bbcd7df45bdbae21a2260a..d1bc73b8ef2479dcf5328d4039f379ce07a4d9ed 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,34 @@
 Notmuch 0.27 (UNRELEASED)
 =========================
 
+General
+-------
+
+Add support for thread:{} queries
+
+  Queries of the form `thread:{foo} and thread:{bar}` match threads
+  containing (possibly distinct) messages matching foo and bar. See
+  `notmuch-search-terms(7)` for details.
+
+Command Line Interface
+----------------------
+
+Add the --full-scan option to `notmuch new`
+
+  This option disables mtime based optimization of scanning for new mail.
+
+Documentation
+-------------
+
+An initial manual for `notmuch-emacs` is now installed by default (in
+`info` format).
+
+Dependencies
+------------
+
+As of this release, support for versions of Xapian before 1.4.0 is
+deprecated, and may disappear in a future release of notmuch.
+
 Notmuch 0.26.2 (2018-04-28)
 ===========================
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 7b66f574d3f9a31f0714942d73943c90aab36c2a..c4e8a2d95b28b7f89449564724261a6e3963a8bb 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.27~rc0'
+__VERSION__ = '0.27~rc1'
 SOVERSION = '5'

diff --git a/configure b/configure
index 3cefdcc6a97a682fd2a8786526436029c067bf24..ab7e1610a0c58c83f942bb5754c14b2657384657 100755 (executable)
--- a/configure
+++ b/configure
@@ -715,7 +715,7 @@ elif [ $uname = "Linux" ] || [ $uname = "GNU" ] ; then
     IFS="
 "
     for path in $ldconfig_paths; do
-       if [ "$path" = "$libdir_expanded" ]; then
+       if [ "$path" -ef "$libdir_expanded" ]; then
            libdir_in_ldconfig=1
        fi
     done

diff --git a/debian/changelog b/debian/changelog
index 0e1275a2927df35eb4f6ebd13037b97a4d7203ed..d37249584d32a27dbc20f93338131af7d81d0e3c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.27~rc1-1) experimental; urgency=medium
+
+  * New upstream release candidate
+
+ -- David Bremner <bremner@debian.org>  Thu, 31 May 2018 08:19:00 -0300
+
 notmuch (0.27~rc0-1) experimental; urgency=medium
 
   * New upstream release candidate

diff --git a/version b/version
index 131761c7801ea5c91fd891aa6d40741c06898bd4..2b1f28403f54ff999d3d022067d03d1d88e50d9f 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.27~rc0
+0.27~rc1