Merge from sid [dgit]

5 files changed, 18 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index 47b0c651..447da3b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,13 @@ notmuch (0.38.3-1) unstable; urgency=medium
 
  -- 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 --git a/debian/control b/debian/control
index 5a3adc04..4fded909 100644
--- a/debian/control
+++ b/debian/control
@@ -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,7 +50,7 @@ Rules-Requires-Root: no
 Package: notmuch
 Architecture: any
 Depends:
- libnotmuch5 (= ${binary:Version}),
+ libnotmuch5t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
@@ -99,7 +99,10 @@ Description: thread-based email index, search and tagging
  .
  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 @@ Package: libnotmuch-dev
 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 @@ Package: python3-notmuch
 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 @@ Package: python3-notmuch2
 Architecture: any
 Section: python
 Depends:
- libnotmuch5 (>= ${source:Version}),
+ libnotmuch5t64 (>= ${source:Version}),
  ${misc:Depends},
  ${python3:Depends},
  ${shlibs:Depends},
diff --git a/debian/libnotmuch5.install b/debian/libnotmuch5t64.install
index a513b475..a513b475 100644
--- a/debian/libnotmuch5.install
+++ b/debian/libnotmuch5t64.install
diff --git a/debian/libnotmuch5t64.lintian-overrides b/debian/libnotmuch5t64.lintian-overrides
new file mode 100644
index 00000000..affb63b4
--- /dev/null
+++ b/debian/libnotmuch5t64.lintian-overrides
@@ -0,0 +1 @@
+libnotmuch5t64: package-name-doesnt-match-sonames libnotmuch5
diff --git a/debian/libnotmuch5.symbols b/debian/libnotmuch5t64.symbols
index e6d2b7c9..5715dec0 100644
--- a/debian/libnotmuch5.symbols
+++ b/debian/libnotmuch5t64.symbols
@@ -1,4 +1,4 @@
-libnotmuch.so.5 libnotmuch5 #MINVER#
+libnotmuch.so.5 libnotmuch5t64 #MINVER#
 * Build-Depends-Package: libnotmuch-dev
  notmuch_built_with@Base 0.23~rc0
  notmuch_config_get@Base 0.32~rc0