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

[notmuch] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 05d7bec06da7173db74cded27b200cbdadc6debf..aa4218c2709994f0b4aa095633fc37f74fbf378a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,15 @@ notmuch (0.32~rc1-1) experimental; urgency=medium
 
  -- 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