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

[Steve Langasek]

Dear maintainer,

Please find attached a final version of this patch for the time_t
transition.  This patch is being uploaded to unstable.

Note that this adds a versioned build-dependency on dpkg-dev, to guard
against accidental backports with a wrong ABI.

Thanks!


-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
-------------- next part --------------
diff -Nru gnuastro-0.22/debian/changelog gnuastro-0.22/debian/changelog
--- gnuastro-0.22/debian/changelog	2024-02-20 08:43:34.000000000 +0000
+++ gnuastro-0.22/debian/changelog	2024-02-28 19:20:35.000000000 +0000
@@ -1,3 +1,10 @@
+gnuastro (0.22-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062183
+
+ -- Steve Langasek <vorlon at debian.org>  Wed, 28 Feb 2024 19:20:35 +0000
+
 gnuastro (0.22-3) unstable; urgency=medium
 
   * 'd/control': Drop not required 'libtool-bin' Build-Depends.
diff -Nru gnuastro-0.22/debian/control gnuastro-0.22/debian/control
--- gnuastro-0.22/debian/control	2024-02-20 08:43:34.000000000 +0000
+++ gnuastro-0.22/debian/control	2024-02-28 19:20:35.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Astro Team <debian-astro-maintainers at lists.alioth.debian.org>
 Uploaders: Mohammad Akhlaghi <mohammad at akhlaghi.org>,
                     Phil Wyett <philip.wyett at kathenas.org>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
                ghostscript,
                libcfitsio-dev,
                libgit2-dev,
@@ -19,10 +19,11 @@
 Vcs-Git: https://salsa.debian.org/debian-astro-team/gnuastro.git
 Vcs-Browser: https://salsa.debian.org/debian-astro-team/gnuastro
 
-Package: libgnuastro20
-Replaces: libgnuastro17,
+Package: libgnuastro20t64
+Provides: ${t64:Provides}
+Replaces: libgnuastro20, libgnuastro17,
           libgnuastro18
-Breaks: libgnuastro17 (<< ${source:Version}),
+Breaks: libgnuastro20 (<< ${source:Version}), libgnuastro17 (<< ${source:Version}),
         libgnuastro18 (<< ${source:Version})
 Architecture: any
 Section: libs
@@ -39,7 +40,7 @@
 Package: libgnuastro-dev
 Architecture: any
 Section: libdevel
-Depends: libgnuastro20 (= ${binary:Version}), ${misc:Depends}
+Depends: libgnuastro20t64 (= ${binary:Version}), ${misc:Depends}
 Description: GNU Astronomy Utilities development files
  GNU Astronomy Utilities (Gnuastro) is a collection of libraries and programs
  for astronomical data analysis and manipulation. The programs can be run on
@@ -50,7 +51,7 @@
 
 Package: gnuastro
 Architecture: any
-Depends: libgnuastro20 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libgnuastro20t64 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: GNU Astronomy Utilities programs
  GNU Astronomy Utilities (Gnuastro) is a collection of libraries and programs
  for astronomical data analysis and manipulation. The programs can be run on
diff -Nru gnuastro-0.22/debian/libgnuastro20.install gnuastro-0.22/debian/libgnuastro20.install
--- gnuastro-0.22/debian/libgnuastro20.install	2024-02-19 15:35:40.000000000 +0000
+++ gnuastro-0.22/debian/libgnuastro20.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.22/debian/libgnuastro20t64.install gnuastro-0.22/debian/libgnuastro20t64.install
--- gnuastro-0.22/debian/libgnuastro20t64.install	1970-01-01 00:00:00.000000000 +0000
+++ gnuastro-0.22/debian/libgnuastro20t64.install	2024-02-19 15:35:40.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.22/debian/libgnuastro20t64.lintian-overrides gnuastro-0.22/debian/libgnuastro20t64.lintian-overrides
--- gnuastro-0.22/debian/libgnuastro20t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ gnuastro-0.22/debian/libgnuastro20t64.lintian-overrides	2024-02-28 19:06:53.000000000 +0000
@@ -0,0 +1 @@
+libgnuastro20t64: package-name-doesnt-match-sonames libgnuastro20