Merge from sid [dgit]

diff --cc debian/changelog
index 47b0c6517f629fff49bee4749fa96794fac68853,a909b9d8e4c9d292a7cd96d584ff00a257edb714..447da3b7fa67e3f8640cf78a1b628f1493156a39
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,18 @@@
 +notmuch (0.38.3-1) unstable; urgency=medium
 +
 +  * New upstream bugfix release
 +  * Bug fix: "Recommends transitional package gnupg-agent instead of
 +    gpg-agent", thanks to Andreas Metzler (Closes: #1064114).
 +
 + -- David Bremner <bremner@debian.org>  Sat, 17 Feb 2024 09:03:50 -0400
 +
+ notmuch (0.38.2-1.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Rename libraries for 64-bit time_t transition.  Closes: #1063205
+ 
+  -- Benjamin Drung <bdrung@debian.org>  Wed, 28 Feb 2024 23:56:48 +0000
+ 
  notmuch (0.38.2-1) unstable; urgency=medium
  
    * New upstream bugfix release

diff --cc debian/control
Simple merge