[Debian-astro-maintainers] Bug#1062183: Acknowledgement (gnuastro: NMU diff for 64-bit time_t transition)

[Lukas Märdian]

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

I'm also uploading this as ~exp2

-- Lukas
-------------- next part --------------
diff -Nru gnuastro-0.20/debian/changelog gnuastro-0.20/debian/changelog
--- gnuastro-0.20/debian/changelog	2023-08-13 19:46:13.000000000 +0000
+++ gnuastro-0.20/debian/changelog	2024-02-05 11:57:04.000000000 +0000
@@ -1,3 +1,11 @@
+gnuastro (0.20-1.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+  * Account for additional t64 Breaks/Replaces (Closes: #1062350).
+
+ -- Lukas Märdian <slyon at debian.org>  Mon, 05 Feb 2024 11:57:04 +0000
+
 gnuastro (0.20-1) unstable; urgency=low
 
   * New upstream version.
diff -Nru gnuastro-0.20/debian/control gnuastro-0.20/debian/control
--- gnuastro-0.20/debian/control	2023-08-13 19:46:13.000000000 +0000
+++ gnuastro-0.20/debian/control	2024-02-05 11:56:54.000000000 +0000
@@ -18,7 +18,14 @@
 Vcs-Git: https://salsa.debian.org/debian-astro-team/gnuastro.git
 Vcs-Browser: https://salsa.debian.org/debian-astro-team/gnuastro
 
-Package: libgnuastro18
+Package: libgnuastro18t64
+Provides: ${t64:Provides}
+Replaces:
+ libgnuastro17,
+ libgnuastro18,
+Breaks:
+ libgnuastro17 (<< ${source:Version}),
+ libgnuastro18 (<< ${source:Version}),
 Architecture: any
 Section: libs
 Multi-Arch: same
@@ -35,7 +42,7 @@
 Package: libgnuastro-dev
 Architecture: any
 Section: libdevel
-Depends: libgnuastro18 (= ${binary:Version}), ${misc:Depends}
+Depends: libgnuastro18t64 (= ${binary:Version}), ${misc:Depends}
 Description: GNU Astronomy Utilities development files
  GNU Astronomy Utilities (Gnuastro) is a collection of programs (the
  `gnuastro' package) and librarires (this package along with `libgnuastro18')
@@ -47,7 +54,7 @@
 
 Package: gnuastro
 Architecture: any
-Depends: libgnuastro18 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libgnuastro18t64 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: GNU Astronomy Utilities programs
  GNU Astronomy Utilities (Gnuastro) is a collection of programs (this
  package) and librarires (`libgnuastro18', `libgnuastro-dev') for
diff -Nru gnuastro-0.20/debian/libgnuastro18.install gnuastro-0.20/debian/libgnuastro18.install
--- gnuastro-0.20/debian/libgnuastro18.install	2023-08-13 19:46:13.000000000 +0000
+++ gnuastro-0.20/debian/libgnuastro18.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-usr/lib/*/libgnuastro*.so.*
-
-# This is a GNU Make extension library for using Gnuastro's library directly
-# with Makefiles without having to use '$(shell ...)'. See:
-#   https://www.gnu.org/software/make/manual/html_node/Loading-Objects.html
-usr/lib/*/libgnuastro_make.so
-usr/lib/*/libgnuastro_make*.so.*
diff -Nru gnuastro-0.20/debian/libgnuastro18t64.install gnuastro-0.20/debian/libgnuastro18t64.install
--- gnuastro-0.20/debian/libgnuastro18t64.install	1970-01-01 00:00:00.000000000 +0000
+++ gnuastro-0.20/debian/libgnuastro18t64.install	2024-02-05 11:54:02.000000000 +0000
@@ -0,0 +1,7 @@
+usr/lib/*/libgnuastro*.so.*
+
+# This is a GNU Make extension library for using Gnuastro's library directly
+# with Makefiles without having to use '$(shell ...)'. See:
+#   https://www.gnu.org/software/make/manual/html_node/Loading-Objects.html
+usr/lib/*/libgnuastro_make.so
+usr/lib/*/libgnuastro_make*.so.*
diff -Nru gnuastro-0.20/debian/libgnuastro18t64.lintian-overrides gnuastro-0.20/debian/libgnuastro18t64.lintian-overrides
--- gnuastro-0.20/debian/libgnuastro18t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ gnuastro-0.20/debian/libgnuastro18t64.lintian-overrides	2024-02-05 11:54:02.000000000 +0000
@@ -0,0 +1 @@
+libgnuastro18t64: package-name-doesnt-match-sonames libgnuastro18