Bug#1063293: psurface: NMU diff for 64-bit time_t transition

2024-02-29 Thread Benjamin Drung
Source: psurface
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, 
TAINT_UNSIGNED_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
diff -Nru psurface-2.0.0/debian/changelog psurface-2.0.0/debian/changelog
--- psurface-2.0.0/debian/changelog 2016-07-18 10:10:45.0 +
+++ psurface-2.0.0/debian/changelog 2024-02-29 21:21:04.0 +
@@ -1,3 +1,10 @@
+psurface (2.0.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063293
+
+ -- Benjamin Drung   Thu, 29 Feb 2024 21:21:04 +
+
 psurface (2.0.0-2) unstable; urgency=medium
 
   * Fix build failure with GCC 6. (Closes: #831159)
diff -Nru psurface-2.0.0/debian/control psurface-2.0.0/debian/control
--- psurface-2.0.0/debian/control   2016-07-18 10:10:45.0 +
+++ psurface-2.0.0/debian/control   2024-02-29 21:21:04.0 +
@@ -7,7 +7,7 @@
 Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/psurface.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/psurface.git
 Homepage: http://numerik.mi.fu-berlin.de/dune/psurface
-Build-Depends: debhelper (>= 9), dh-autoreconf
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper (>= 9), dh-autoreconf
 
 Package: psurface
 Architecture: any
@@ -25,7 +25,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libpsurface0v5 (= ${binary:Version})
+Depends: ${misc:Depends}, libpsurface0t64 (= ${binary:Version})
 Suggests: libpsurface-dbg (= ${binary:Version}), psurface (= ${binary:Version})
 Description: piecewise linear bijections between triangulated surfaces -- 
development files
  Psurface is a C++ library that handles piecewise linear bijections
@@ -58,7 +58,7 @@
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
- libpsurface0v5 (= ${binary:Version}), psurface (= ${binary:Version})
+ libpsurface0t64 (= ${binary:Version}), psurface (= ${binary:Version})
 Description: piecewise linear bijections between triangulated surfaces -- 
debug symbols
  Psurface is a C++ library that handles piecewise linear bijections
  between triangulated surfaces. These surfaces can be of arbitrary
@@ -66,13 +66,16 @@
  .
  This package contains debug symbols.
 
-Package: libpsurface0v5
+Package: libpsurface0t64
+Provides: ${t64:Provides}
+X-Time64-Compat: libpsurface0v5
+Breaks: libpsurface0v5 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Conflicts: libpsurface0
-Replaces: libpsurface0
+Replaces: libpsurface0v5, libpsurface0
 Description: piecewise linear bijections between triangulated surfaces -- 
shared library
  Psurface is a C++ library that handles piecewise linear bijections
  between triangulated surfaces. These surfaces can be of arbitrary
diff -Nru psurface-2.0.0/debian/libpsurface0t64.install 
psurface-2.0.0/debian/libpsurface0t64.install
--- psurface-2.0.0/debian/libpsurface0t64.install   1970-01-01 
00:00:00.0 +
+++ psurface-2.0.0/debian/libpsurface0t64.install   2016-07-18 
09:45:41.0 +
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff -Nru psurface-2.0.0/debian/libpsurface0t64.lintian-overrides 
psurface-2.0.0/debian/libpsurface0t64.lintian-overrides
--- psurface-2.0.0/debian/libpsurface0t64.lintian-overrides 1970-01-01 
00:00:00.0 +
+++ psurface-2.0.0/debian/libpsurface0t64.lintian-overrides 2024-02-29 
21:21:00.0 +
@@ -0,0 +1 @@
+libpsurface0t64: package-name-doesnt-match-sonames libpsurface0v5
diff -Nru psurface-2.0.0/debian/libpsurface0v5.install 
psurface-2.0.0/debian/libpsurface0v5.install
--- psurface-2.0.0/debian/libpsurface0v5.install2016-07-18 
09:45:41.0 +
+++ psurface-2.0.0/debian/libpsurface0v5.install1970-01-01 
00:00:00.0 +
@@ -1 +0,0 @@
-usr/lib/*/*.so.*


Bug#1063293: psurface: NMU diff for 64-bit time_t transition

2024-02-05 Thread Lucas Kanashiro
Source: psurface
Version: 2.0.0-2
Severity: serious
Tags: patch pending sid trixie
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t

NOTICE: these changes must not be uploaded to unstable yet!

Dear maintainer,

As part of the 64-bit time_t transition required to support 32-bit
architectures in 2038 and beyond
(https://wiki.debian.org/ReleaseGoals/64bit-time), we have identified
psurface as a source package shipping runtime libraries whose ABI
either is affected by the change in size of time_t, or could not be
analyzed via abi-compliance-checker (and therefore to be on the safe
side we assume is affected).

To ensure that inconsistent combinations of libraries with their
reverse-dependencies are never installed together, it is necessary to
have a library transition, which is most easily done by renaming the
runtime library package.

Since turning on 64-bit time_t is being handled centrally through a change
to the default dpkg-buildflags (https://bugs.debian.org/1037136), it is
important that libraries affected by this ABI change all be uploaded close
together in time.  Therefore I have prepared a 0-day NMU for psurface
which will initially be uploaded to experimental if possible, then to
unstable after packages have cleared binary NEW.

Please find the patch for this NMU attached.

If you have any concerns about this patch, please reach out ASAP.  Although
this package will be uploaded to experimental immediately, there will be a
period of several days before we begin uploads to unstable; so if information
becomes available that your package should not be included in the transition,
there is time for us to amend the planned uploads.



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

Kernel: Linux 6.5.0-15-generic (SMP w/32 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=C.UTF-8, 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)
diff -Nru psurface-2.0.0/debian/changelog psurface-2.0.0/debian/changelog
--- psurface-2.0.0/debian/changelog 2016-07-18 07:10:45.0 -0300
+++ psurface-2.0.0/debian/changelog 2024-02-05 23:32:26.0 -0300
@@ -1,3 +1,10 @@
+psurface (2.0.0-2.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Lucas Kanashiro   Mon, 05 Feb 2024 23:32:26 -0300
+
 psurface (2.0.0-2) unstable; urgency=medium
 
   * Fix build failure with GCC 6. (Closes: #831159)
diff -Nru psurface-2.0.0/debian/control psurface-2.0.0/debian/control
--- psurface-2.0.0/debian/control   2016-07-18 07:10:45.0 -0300
+++ psurface-2.0.0/debian/control   2024-02-05 23:32:25.0 -0300
@@ -25,7 +25,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libpsurface0v5 (= ${binary:Version})
+Depends: ${misc:Depends}, libpsurface0t64 (= ${binary:Version})
 Suggests: libpsurface-dbg (= ${binary:Version}), psurface (= ${binary:Version})
 Description: piecewise linear bijections between triangulated surfaces -- 
development files
  Psurface is a C++ library that handles piecewise linear bijections
@@ -58,7 +58,7 @@
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
- libpsurface0v5 (= ${binary:Version}), psurface (= ${binary:Version})
+ libpsurface0t64 (= ${binary:Version}), psurface (= ${binary:Version})
 Description: piecewise linear bijections between triangulated surfaces -- 
debug symbols
  Psurface is a C++ library that handles piecewise linear bijections
  between triangulated surfaces. These surfaces can be of arbitrary
@@ -66,13 +66,16 @@
  .
  This package contains debug symbols.
 
-Package: libpsurface0v5
+Package: libpsurface0t64
+Provides: ${t64:Provides}
+X-Time64-Compat: libpsurface0v5
+Breaks: libpsurface0v5 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Conflicts: libpsurface0
-Replaces: libpsurface0
+Replaces: libpsurface0v5, libpsurface0
 Description: piecewise linear bijections between triangulated surfaces -- 
shared library
  Psurface is a C++ library that handles piecewise linear bijections
  between triangulated surfaces. These surfaces can be of arbitrary
diff -Nru psurface-2.0.0/debian/libpsurface0t64.install 
psurface-2.0.0/debian/libpsurface0t64.install
--- psurface-2.0.0/debian/libpsurface0t64.install   1969-12-31 
21:00:00.0 -0300
+++ psurface-2.0.0/debian/libpsurface0t64.install   2016-07-18 
06:45:41.0 -0300
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff -Nru psurface-2.0.0/debian/libpsurface0t64.lintian-overrides 
psurface-2.0.0/debian/libpsurface0t64.lintian-overrides
--- psurface-2.0.0/debian/libpsurface0t64.lintian-overrides 1969-12-31 
21:00:00.0