Merge remote-tracking branch 'origin/debian/bullseye' into release

diff --cc debian/changelog
index 05d7bec06da7173db74cded27b200cbdadc6debf,ebfd92097823e18640f6dc0b059045ddbbbabe1f..aa4218c2709994f0b4aa095633fc37f74fbf378a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,49 -1,12 +1,58 @@@
 +notmuch (0.32.3-1) unstable; urgency=medium
 +
 +  * new upstream bugfix release
 +  * fixes for a few configuration related bugs introduced in 0.32
 +  * bump libnotmuch minor version to match documentation.
 +
 + -- David Bremner <bremner@debian.org>  Tue, 17 Aug 2021 17:16:09 -0700
 +
 +notmuch (0.32.2-1) experimental; urgency=medium
 +
 +  * New upstream bugfix release
 +  * Fix for memory leak in "notmuch new" introduced in 0.32
 +  * Fix for bug from 2017 that can add duplicate thread-ids to messages.
 +
 + -- David Bremner <bremner@debian.org>  Sat, 26 Jun 2021 22:33:56 -0300
 +
 +notmuch (0.32.1-1) experimental; urgency=medium
 +
 +  * New upstream bugfix release
 +  * Configuration bug fixes (see /usr/share/doc/notmuch/NEWS.gz)
 +  * Bug fix for {pre,after}-tag hooks in emacs, related to lexical scope
 +    transition.
 +
 + -- David Bremner <bremner@debian.org>  Sat, 15 May 2021 09:01:27 -0300
 +
 +notmuch (0.32-1) experimental; urgency=medium
 +
 +  * New upstream release
 +  * Speedup for handling deleted message files
 +  * New configuration features (see /usr/share/doc/notmuch/NEWS.gz) 
 +  * Emacs interface codebase cleanup
 +
 + -- David Bremner <bremner@debian.org>  Sun, 02 May 2021 07:05:15 -0300
 +
 +notmuch (0.32~rc2-1) experimental; urgency=medium
 +
 +  * New upstream release candidate
 +
 + -- David Bremner <bremner@debian.org>  Wed, 28 Apr 2021 07:05:22 -0300
 +
 +notmuch (0.32~rc1-1) experimental; urgency=medium
 +
 +  * New upstream release candidate
 +
 + -- David Bremner <bremner@debian.org>  Sat, 24 Apr 2021 12:46:10 -0300
 +
+ notmuch (0.31.4-2) unstable; urgency=medium
+ 
+   * Cherry pick upstream commit 3f4de98e7c8, which fixes a bug where
+     duplicate message-ids can cause multiple thread-ids for some message
+     documents.
+   * Add build-dependency on xapian-tools, for new test
+ 
+  -- David Bremner <bremner@debian.org>  Mon, 28 Jun 2021 22:48:02 -0300
+ 
  notmuch (0.31.4-1) unstable; urgency=medium
  
    * New upstream bugfix release