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

[mwhudson at fastmail.fm]

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'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-21-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.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 funtools-1.4.8/debian/changelog funtools-1.4.8/debian/changelog
--- funtools-1.4.8/debian/changelog	2021-08-28 15:39:50.000000000 +0000
+++ funtools-1.4.8/debian/changelog	2024-02-28 09:20:29.000000000 +0000
@@ -1,3 +1,10 @@
+funtools (1.4.8-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1061957
+
+ -- Michael Hudson-Doyle <mwhudson at debian.org>  Wed, 28 Feb 2024 09:20:29 +0000
+
 funtools (1.4.8-1) unstable; urgency=medium
 
   [ Debian Janitor ]
diff -Nru funtools-1.4.8/debian/control funtools-1.4.8/debian/control
--- funtools-1.4.8/debian/control	2021-08-28 15:37:16.000000000 +0000
+++ funtools-1.4.8/debian/control	2024-02-28 09:20:29.000000000 +0000
@@ -3,7 +3,7 @@
 Uploaders: Ole Streicher <olebole at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
                gawk,
                libwcstools-dev,
                tcl-dev,
@@ -31,7 +31,10 @@
  .
  This package contains the tools.
 
-Package: libfuntools1
+Package: libfuntools1t64
+Provides: ${t64:Provides}
+Replaces: libfuntools1
+Breaks: libfuntools1 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -56,7 +59,7 @@
 Package: libfuntools-dev
 Architecture: any
 Section: libdevel
-Depends: libfuntools1 (= ${binary:Version}),
+Depends: libfuntools1t64 (= ${binary:Version}),
          libwcstools-dev,
          ${misc:Depends}
 Description: Minimal buy-in FITS library (development files)
@@ -75,7 +78,7 @@
 Package: tcl-funtools
 Architecture: any
 Section: interpreters
-Depends: libfuntools1 (= ${binary:Version}),
+Depends: libfuntools1t64 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Minimal buy-in FITS library (Tcl interface)
diff -Nru funtools-1.4.8/debian/libfuntools1.install funtools-1.4.8/debian/libfuntools1.install
--- funtools-1.4.8/debian/libfuntools1.install	2017-02-04 10:13:19.000000000 +0000
+++ funtools-1.4.8/debian/libfuntools1.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libfuntools.so.1
-usr/lib/*/libfuntools.so.1.0
diff -Nru funtools-1.4.8/debian/libfuntools1t64.install funtools-1.4.8/debian/libfuntools1t64.install
--- funtools-1.4.8/debian/libfuntools1t64.install	1970-01-01 00:00:00.000000000 +0000
+++ funtools-1.4.8/debian/libfuntools1t64.install	2017-02-04 10:13:19.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libfuntools.so.1
+usr/lib/*/libfuntools.so.1.0
diff -Nru funtools-1.4.8/debian/libfuntools1t64.lintian-overrides funtools-1.4.8/debian/libfuntools1t64.lintian-overrides
--- funtools-1.4.8/debian/libfuntools1t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ funtools-1.4.8/debian/libfuntools1t64.lintian-overrides	2024-02-28 09:20:21.000000000 +0000
@@ -0,0 +1 @@
+libfuntools1t64: package-name-doesnt-match-sonames libfuntools1