Bug#1062102: Acknowledgement (gerris: NMU diff for 64-bit time_t transition)

[Lukas Märdian]

Attaching an updated debdiff, which fixes usrmerge conflicts.
See https://bugs.debian.org/1062351

I'm also uploading this as ~exp2

-- Lukas
-------------- next part --------------
diff -Nru gerris-20131206+dfsg/debian/changelog gerris-20131206+dfsg/debian/changelog
--- gerris-20131206+dfsg/debian/changelog	2020-02-10 09:37:14.000000000 +0000
+++ gerris-20131206+dfsg/debian/changelog	2024-02-05 11:23:36.000000000 +0000
@@ -1,3 +1,11 @@
+gerris (20131206+dfsg-19.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+  * Account for additional t64 Breaks/Replaces (Closes: #1062351).
+
+ -- Lukas Märdian <slyon at debian.org>  Mon, 05 Feb 2024 12:23:36 +0100
+
 gerris (20131206+dfsg-19) unstable; urgency=medium
 
   * Team upload.
diff -Nru gerris-20131206+dfsg/debian/control gerris-20131206+dfsg/debian/control
--- gerris-20131206+dfsg/debian/control	2020-02-10 09:37:14.000000000 +0000
+++ gerris-20131206+dfsg/debian/control	2024-02-05 11:23:36.000000000 +0000
@@ -54,15 +54,18 @@
  .
  This package has MPI support built in.
 
-Package: libgfs-1.3-2
+Package: libgfs-1.3-2t64
+Provides: ${t64:Provides}
 Architecture: any
 Section: devel
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Breaks:
+ libgfs-1.3-2 (<< ${source:Version}),
  libgfs-mpi-1.3-2 (<< 20131206+dfsg-7)
 Replaces:
+ libgfs-1.3-2,
  libgfs-mpi-1.3-2 (<< 20131206+dfsg-7)
 Description: Fluid Flow Solver -- shared libraries
  Gerris is a system for the solution of the partial differential
@@ -77,7 +80,7 @@
 Section: libdevel
 Depends:
  ffmpeg,
- libgfs-1.3-2 (= ${binary:Version}),
+ libgfs-1.3-2t64 (= ${binary:Version}),
  libgts-dev,
  ${misc:Depends},
  ${shlibs:Depends}
diff -Nru gerris-20131206+dfsg/debian/libgfs-1.3-2.install gerris-20131206+dfsg/debian/libgfs-1.3-2.install
--- gerris-20131206+dfsg/debian/libgfs-1.3-2.install	2020-02-10 09:37:14.000000000 +0000
+++ gerris-20131206+dfsg/debian/libgfs-1.3-2.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/libgfs*.so.*
diff -Nru gerris-20131206+dfsg/debian/libgfs-1.3-2.lintian-overrides gerris-20131206+dfsg/debian/libgfs-1.3-2.lintian-overrides
--- gerris-20131206+dfsg/debian/libgfs-1.3-2.lintian-overrides	2020-02-10 09:37:14.000000000 +0000
+++ gerris-20131206+dfsg/debian/libgfs-1.3-2.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-libgfs-1.3-2: package-name-doesnt-match-sonames
diff -Nru gerris-20131206+dfsg/debian/libgfs-1.3-2t64.install gerris-20131206+dfsg/debian/libgfs-1.3-2t64.install
--- gerris-20131206+dfsg/debian/libgfs-1.3-2t64.install	1970-01-01 00:00:00.000000000 +0000
+++ gerris-20131206+dfsg/debian/libgfs-1.3-2t64.install	2024-02-05 11:23:36.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/libgfs*.so.*
diff -Nru gerris-20131206+dfsg/debian/libgfs-1.3-2t64.lintian-overrides gerris-20131206+dfsg/debian/libgfs-1.3-2t64.lintian-overrides
--- gerris-20131206+dfsg/debian/libgfs-1.3-2t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ gerris-20131206+dfsg/debian/libgfs-1.3-2t64.lintian-overrides	2024-02-05 11:23:36.000000000 +0000
@@ -0,0 +1,2 @@
+libgfs-1.3-2t64: package-name-doesnt-match-sonames
+libgfs-1.3-2t64: package-name-doesnt-match-sonames libgfs-1.3-2