Merge from sid [dgit]

diff --combined 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 --combined debian/control
index 5a3adc04f4f0f37f5352bf74792327b07e10ed3c,26871bc24015e724d8006eb67cf597ee571dfd8e..4fded909a03ca5d4910c2cc8f1fee4f03795ebbe
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -9,7 -9,7 +9,7 @@@ Build-Conflicts
   gdb [ia64 mips mips64el hppa],
   gdb-minimal,
   ruby1.8,
- Build-Depends:
+ Build-Depends: dpkg-dev (>= 1.22.5),
   bash-completion (>=1.9.0~),
   debhelper-compat (= 13),
   dh-elpa (>= 1.3),
@@@ -50,12 -50,12 +50,12 @@@ Rules-Requires-Root: n
  Package: notmuch
  Architecture: any
  Depends:
-  libnotmuch5 (= ${binary:Version}),
+  libnotmuch5t64 (= ${binary:Version}),
   ${misc:Depends},
   ${shlibs:Depends},
  Recommends:
   elpa-notmuch | notmuch-vim | notmuch-mutt | alot,
 - gnupg-agent,
 + gpg-agent,
   gpgsm,
  Suggests:
   mailscripts,
@@@ -99,7 -99,10 +99,10 @@@ Description: thread-based email index, 
   .
   This package contains the HTML documentation
  
- Package: libnotmuch5
+ Package: libnotmuch5t64
+ Provides: ${t64:Provides}
+ Replaces: libnotmuch5
+ Breaks: libnotmuch5 (<< ${source:Version})
  Section: libs
  Architecture: any
  Depends:
@@@ -120,7 -123,7 +123,7 @@@ Package: libnotmuch-de
  Section: libdevel
  Architecture: any
  Depends:
-  libnotmuch5 (= ${binary:Version}),
+  libnotmuch5t64 (= ${binary:Version}),
   ${misc:Depends},
  Description: thread-based email index, search and tagging (development)
   Notmuch is a system for indexing, searching, reading, and tagging
@@@ -135,7 -138,7 +138,7 @@@ Package: python3-notmuc
  Architecture: all
  Section: python
  Depends:
-  libnotmuch5 (>= ${source:Version}),
+  libnotmuch5t64 (>= ${source:Version}),
   ${misc:Depends},
   ${python3:Depends},
  Description: Python 3 legacy interface to the notmuch mail search and index library
@@@ -153,7 -156,7 +156,7 @@@ Package: python3-notmuch
  Architecture: any
  Section: python
  Depends:
-  libnotmuch5 (>= ${source:Version}),
+  libnotmuch5t64 (>= ${source:Version}),
   ${misc:Depends},
   ${python3:Depends},
   ${shlibs:Depends},