Merge branch 'debian/unstable' into release

merge bugfix uploads from other branch

diff --cc debian/changelog
index 45c08461d24a98dd57338a9656852c2181b6df2a,131f47e69be06d0767ead630a3359bce046ed292..ef8351660cde90e6a4b9d132fc7cc4191e3afbd8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,50 -1,17 +1,64 @@@
 +notmuch (0.39-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +  * Legacy python bindings (package python3-notmuch) are no longer
 +    built. Consider switching to python3-notmuch2.
 +
 + -- David Bremner <bremner@debian.org>  Sat, 15 Mar 2025 07:03:50 -0300
 +
 +notmuch (0.39~rc3-1) experimental; urgency=medium
 +
 +  * New upstream pre-release
 +
 + -- David Bremner <bremner@debian.org>  Fri, 14 Mar 2025 19:07:04 -0300
 +
 +notmuch (0.39~rc2-2) experimental; urgency=medium
 +
 +  * Increase test timeout to 10m (per test script). This is currently
 +    only needed for riscv64, but should be harmless elsewhere.
 +
 + -- David Bremner <bremner@debian.org>  Tue, 11 Mar 2025 19:39:27 -0300
 +
 +notmuch (0.39~rc2-1) experimental; urgency=medium
 +
 +  * New upstream pre-release
 +  * Bug fix: "FTBFS: 1 test failed.", thanks to Santiago Vila (Closes:
 +    #1099252).
 +
 + -- David Bremner <bremner@debian.org>  Mon, 10 Mar 2025 21:00:09 -0300
 +
 +notmuch (0.39~rc1-1) experimental; urgency=medium
 +
 +  * New upstream pre-release
 +  * Bug fix: "FTBFS: 3 tests fail against Emacs 30.1", thanks to Sean
 +    Whitton (Closes: #1098852). Force emacs 30 to use the older
 +    pretty-printing style.
 +
 + -- David Bremner <bremner@debian.org>  Tue, 25 Feb 2025 16:35:06 -0400
 +
 +notmuch (0.39~rc0-1) experimental; urgency=medium
 +
 +  * New upstream pre-release
 +  * Remove binary package python3-notmuch (Closes: #893057, #970834, #749890).
 +  * Bug fix: "saving draft causing missing header fields", thanks to
 +    Xiyue Deng (Closes: #1092047).
 +
 + -- David Bremner <bremner@debian.org>  Sat, 22 Feb 2025 08:12:33 -0400
 +
+ notmuch (0.38.3-5) unstable; urgency=medium
+ 
+   * Bug fix: "test suite regressions with fixed GnuPG", thanks to
+     Daniel Kahn Gillmor (Closes: #1098995).
+ 
+  -- David Bremner <bremner@debian.org>  Fri, 28 Feb 2025 16:24:35 -0500
+ 
+ notmuch (0.38.3-4) unstable; urgency=medium
+ 
+   * Bug fix: "FTBFS: 3 tests fail against Emacs 30.1", thanks to Sean
+     Whitton (Closes: #1098852). Cherry-pick upstream commit e3d4721b1.
+ 
+  -- David Bremner <bremner@debian.org>  Tue, 25 Feb 2025 16:51:36 -0400
+ 
  notmuch (0.38.3-3) unstable; urgency=medium
  
    [ James McCoy ]