From: David Bremner <david@tethera.net>
Date: Sat, 2 Jun 2018 18:54:28 +0000 (-0300)
Subject: Merge tag '0.27_rc1'
X-Git-Tag: debian/0.28_rc0-1~47
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=e00e235e65a404315d06f70ec6066d259f8ee802;hp=fd20a31e4cf2485d0446a844f9facf54592728ba

Merge tag '0.27_rc1'

notmuch 0.27~rc1 release
---

diff --git a/NEWS b/NEWS
index a5eb6439..d1bc73b8 100644
--- 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 7b66f574..c4e8a2d9 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.27~rc0'
+__VERSION__ = '0.27~rc1'
 SOVERSION = '5'
diff --git a/configure b/configure
index 3cefdcc6..ab7e1610 100755
--- 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 0e1275a2..d3724958 100644
--- 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 131761c7..2b1f2840 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.27~rc0
+0.27~rc1