Merge tag '0.26'

notmuch 0.26 release

4 files changed, 67 insertions, 15 deletions

diff --git a/NEWS b/NEWS
index efd9043d..e4f8160b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,16 +1,6 @@
-Notmuch 0.26 (UNRELEASED)
+Notmuch 0.26 (2018-01-09)
 =========================
 
-Test Suite
-----------
-
-Out-of-tree builds
-
-  The test suite now works properly with out-of-tree builds, i.e. with
-  separate source and build directories. The --root option to tests
-  has been dropped. The same can now be achieved more reliably using
-  out-of-tree builds.
-
 Command Line Interface
 ----------------------
 
@@ -35,12 +25,30 @@ Support maildir synced tags in `new.tags`
   maildir syncing, and will be added for files in `new/` regardless of
   the setting of `new.tags`.
 
---decrypt now takes an explicit argument
+Support /regex/ in new.ignore
+
+  Files and directories may be ignored based on regular expressions.
+
+Allow `notmuch insert --folder=""`
+
+  This inserts into the top level folder.
+
+Strip trailing '/' from folder path for notmuch insert
+
+  This prevents a potential problem with duplicated database records.
+
+New option --output=address for notmuch address
+
+Make `notmuch show` more robust against deleting duplicate files
+
+The option --decrypt now takes an explicit argument
 
   The --decrypt option to `notmuch show` and `notmuch reply` now takes
   an explicit argument.  If you were used to invoking `notmuch show
   --decrypt`, you should switch to `notmuch show --decrypt=true`.
 
+Boolean and keyword arguments now take a `--no-` prefix
+
 Encrypted Mail
 --------------
 
@@ -67,6 +75,16 @@ Indexing cleartext of encrypted e-mails
   index are roughly equivalent to the cleartext as well.  DO NOT USE
   this feature without considering the security of your index.
 
+Emacs
+-----
+
+Guard against concurrent searches in notmuch-tree
+
+Use make-process when available
+
+  This allows newer Emacs to separate stdout and stderr from the
+  notmuch command without using temporary files.
+
 Library Changes
 ---------------
 
@@ -102,6 +120,16 @@ Transition `notmuch_database_add_message` to `notmuch_database_index_file`
    allows passing a set of options to the indexing engine, which the
    operator may decide to change from message to message.
 
+Test Suite
+----------
+
+Out-of-tree builds
+
+  The test suite now works properly with out-of-tree builds, i.e. with
+  separate source and build directories. The --root option to tests
+  has been dropped. The same can now be achieved more reliably using
+  out-of-tree builds.
+
 Python Bindings
 ---------------
 
@@ -114,7 +142,7 @@ Open mail files in binary mode when using Python 3
 
   This avoids certain encoding related crashes under Python 3.
 
-Add python bindings for notmuch_database_{get,set}_config*
+Add python bindings for `notmuch_database_{get,set}_config*`
 
 Optional `decrypt_policy` flag is available for notmuch.database().index_file()
 
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index cb039de6..bc246330 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.26~rc1'
+__VERSION__ = '0.26'
 SOVERSION = '5'
diff --git a/debian/changelog b/debian/changelog
index 4ac6ab5f..5f02d7a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+notmuch (0.26-1) unstable; urgency=medium
+
+  [ Daniel Kahn Gillmor ]
+  * build against python3-sphinx instead of python-sphinx
+  * d/changelog: strip trailing whitespace
+  * move to debhelper 10
+  * Standards-Version: bump to 4.1.3 (drop priority: extra
+    from transitional packages)
+
+  [ David Bremner ]
+  * New upstream release (see /usr/share/doc/notmuch/NEWS.gz)
+    - new command 'notmuch reindex'
+    - optional indexing of encrypted emails.
+    - indexing of files with duplicate message-id
+  * update symbols
+
+ -- David Bremner <bremner@debian.org>  Tue, 09 Jan 2018 07:13:21 -0400
+
+notmuch (0.26~rc2-1) experimental; urgency=medium
+
+  * Third upstream release candidate
+
+ -- David Bremner <bremner@debian.org>  Tue, 09 Jan 2018 07:13:11 -0400
+
 notmuch (0.26~rc1-1) experimental; urgency=medium
 
   * Second upstream release candidate
diff --git a/version b/version
index 0de55d6e..99222150 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.26~rc1
+0.26