From 460749d357225324bb1b752b858bfdba1c13f7bf Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 29 May 2018 20:57:37 -0300 Subject: [PATCH 1/7] NEWS: deprecate pre-1.4.0 Xapian We want to give people some heads up before dropping support, since removing a bunch of ifdefs will be a pain to revert. --- NEWS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS b/NEWS index a5eb6439..bc96c1b7 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,12 @@ Notmuch 0.27 (UNRELEASED) ========================= +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) =========================== From fbf644d553e466d8182c33a1572242619d8f83ef Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 29 May 2018 21:48:55 -0300 Subject: [PATCH 2/7] NEWS: mention thread:{} queries --- NEWS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/NEWS b/NEWS index bc96c1b7..7b8dd7bb 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,15 @@ 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. + Dependencies ------------ From a8c5256457c67e5480e10ede6fb0abd231c6203c Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 29 May 2018 22:07:42 -0300 Subject: [PATCH 3/7] NEWS: mention notmuch --full-scan --- NEWS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 7b8dd7bb..6bc68e0b 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,13 @@ Add support for thread:{} queries 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. + Dependencies ------------ From 2f59498d6905a80de5342362e0822d9295b4bf78 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 29 May 2018 22:31:07 -0300 Subject: [PATCH 4/7] NEWS: document installation of notmuch-emacs manual --- NEWS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS b/NEWS index 6bc68e0b..d1bc73b8 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,12 @@ 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 ------------ From b71fa262b54398399821e89d01d984f46e24d2e8 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 29 May 2018 19:03:17 -0700 Subject: [PATCH 5/7] configure: check for links to/from libdir in ldconfig output If e.g. /lib is a link to /usr/lib, then the latter may not show up in the way we expect in the output of ldconfig. 'test foo -ef bar' checks if foo and bar have the same device and inode numbers. Since (at least in bash, dash, ksh, and zsh) the shell dereferences symlinks before applying the test, this includes both the case where file1 is equal to file2 and the case where one is a symlink to the other. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 98bdbae9f9adcf5543e723b2adfeeae4f3adfcf8 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 31 May 2018 08:17:12 -0300 Subject: [PATCH 6/7] version: bump to 0.27~rc1 --- bindings/python/notmuch/version.py | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/version b/version index 131761c7..2b1f2840 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.27~rc0 +0.27~rc1 From db8602120a7b2629501f78ce9cea087274cd6b2a Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 31 May 2018 08:19:25 -0300 Subject: [PATCH 7/7] debian: changelog stanza for 0.27~rc1-1 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) 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 Thu, 31 May 2018 08:19:00 -0300 + notmuch (0.27~rc0-1) experimental; urgency=medium * New upstream release candidate