Bug#1063267: vtk9: NMU diff for 64-bit time_t transition

2024-02-28 Thread 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'), (1, 'experimental')
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)
diff -Nru vtk9-9.1.0+really9.1.0+dfsg2/debian/changelog 
vtk9-9.1.0+really9.1.0+dfsg2/debian/changelog
--- vtk9-9.1.0+really9.1.0+dfsg2/debian/changelog   2023-08-21 
22:27:20.0 +
+++ vtk9-9.1.0+really9.1.0+dfsg2/debian/changelog   2024-02-28 
23:38:25.0 +
@@ -1,3 +1,10 @@
+vtk9 (9.1.0+really9.1.0+dfsg2-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063267
+
+ -- Steve Langasek   Wed, 28 Feb 2024 23:38:25 +
+
 vtk9 (9.1.0+really9.1.0+dfsg2-7) unstable; urgency=medium
 
   * Team upload.
diff -Nru vtk9-9.1.0+really9.1.0+dfsg2/debian/control 
vtk9-9.1.0+really9.1.0+dfsg2/debian/control
--- vtk9-9.1.0+really9.1.0+dfsg2/debian/control 2023-08-21 19:01:21.0 
+
+++ vtk9-9.1.0+really9.1.0+dfsg2/debian/control 2024-02-28 23:38:25.0 
+
@@ -5,7 +5,7 @@
Nico Schlömer 
 Section: graphics
 Priority: optional
-Build-Depends: chrpath,
+Build-Depends: dpkg-dev (>= 1.22.5), chrpath,
cmake (>= 3.2.0),
debhelper-compat (= 13),
default-jdk [!hppa !hurd-any !kfreebsd-any],
@@ -117,7 +117,7 @@
  libtheora-dev,
  libtiff-dev,
  libutfcpp-dev,
- libvtk9.1 (= ${binary:Version}),
+ libvtk9.1t64 (= ${binary:Version}),
  libvtk9-java (= ${binary:Version}) [!hppa !hurd-any !kfreebsd-any],
  libx11-dev,
  libxft-dev,
@@ -140,12 +140,13 @@
  This package provides the VTK header files required to compile
  C++ programs that use VTK to do 3D visualisation.
 
-Package: libvtk9.1
+Package: libvtk9.1t64
+Provides: ${t64:Provides}
 Architecture: any
 Multi-Arch: same
 Section: libs
-Breaks: libvtk9 (<< 9.1.0+really9.1.0)
-Replaces: libvtk9 (<< 9.1.0+really9.1.0)
+Breaks: libvtk9.1 (<< ${source:Version}), libvtk9 (<< 9.1.0+really9.1.0)
+Replaces: libvtk9.1, libvtk9 (<< 9.1.0+really9.1.0)
 Depends: ${misc:Depends},
  ${shlibs:Depends}
 Suggests: mpi-default-bin,
@@ -179,7 +180,7 @@
 Package: python3-vtk9
 Architecture: any
 Section: python
-Depends: libvtk9.1 (= ${binary:Version}),
+Depends: libvtk9.1t64 (= ${binary:Version}),
  python3-mpi4py,
  ${misc:Depends},
  ${python3:Depends},
@@ -200,7 +201,7 @@
 Package: vtk9
 Architecture: any
 Section: interpreters
-Depends: libvtk9.1 (= ${binary:Version}),
+Depends: libvtk9.1t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends}
 Suggests: vtk9-doc,
@@ -240,7 +241,11 @@
  .
  This package provides examples for VTK9
 
-Package: libvtk9.1-qt
+Package: libvtk9.1t64-qt
+Provides: ${t64:Provides}
+X-Time64-Compat: libvtk9.1-qt
+Replaces: libvtk9.1-qt
+Breaks: libvtk9.1-qt (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -258,7 +263,7 @@
 Multi-Arch: same
 Section: libdevel
 Depends: libvtk9-dev (= ${binary:Version}),
- libvtk9.1-qt (= ${binary:Version}),
+ libvtk9.1t64-qt (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
  qtbase5-dev,
diff -Nru vtk9-9.1.0+really9.1.0+dfsg2/debian/libvtk9.1-qt.install 
vtk9-9.1.0+really9.1.0+dfsg2/debian/libvtk9.1-qt.install
--- vtk9-9.1.0+really9.1.0+dfsg2/debian/libvtk9.1-qt.install2023-08-21 
19:01:21.0 +
+++ vtk9-9.1.0+really9.1.0+dfsg2/debian/libvtk9.1-qt.install1970-01-01 
00:00:00.0 +
@@ -1 +0,0 @@
-usr/lib/*/*Qt*.so.*
diff -Nru vtk9-9.1.0+really9.1.0+dfsg2/debian/libvtk9.1-qt.lintian-overrides 
vtk9-9.1.0+really9.1.0+dfsg2/debian/libvtk9.1-qt.lintian-overrides
--- vtk9-9.1.0+really9.1.0+dfsg2/debian/libvtk9.1-qt.lintian-overrides  
2023-08-21 19:01:21.0 +
+++ vtk9-9.1.0+really9.1.0+dfsg2/debian/libvtk9.1-qt.lintian-overrides  
1970-01-01 00:00:00.0 +
@@ -1 +0,0 @@
-libvtk9.1-qt: package-name-doesnt-match-sonames
diff -Nru vtk9-9.1.0+really9.1.0+dfsg2/debian/libvtk9.1.install 
vtk9-9.1.0+really9.1.0+dfsg2/debian/libvtk9.1.install
--- vtk9-9.1.0+really9.1.0+dfsg2/debian/libvtk9.1.install   2023-08-21 
19:01:21.0 +
+++ vtk9-9.1.0+really9.1.0+dfsg2/debian/libvtk9.1.install   1970-01-01 
00:00:00.0 +
@@ -1,2 +0,0 @@
-usr/lib/*/*.so.*
-usr/lib/*/vtk
diff -Nru 

Bug#1063267: vtk9: NMU diff for 64-bit time_t transition

2024-02-05 Thread Steve Langasek
Source: vtk9
Version: 9.1.0+really9.1.0+dfsg2-7
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
vtk9 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 vtk9
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-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)
diff -Nru vtk9-9.1.0+really9.1.0+dfsg2/debian/changelog 
vtk9-9.1.0+really9.1.0+dfsg2/debian/changelog
--- vtk9-9.1.0+really9.1.0+dfsg2/debian/changelog   2023-08-21 
22:27:20.0 +
+++ vtk9-9.1.0+really9.1.0+dfsg2/debian/changelog   2024-02-05 
20:18:42.0 +
@@ -1,3 +1,10 @@
+vtk9 (9.1.0+really9.1.0+dfsg2-7.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Mon, 05 Feb 2024 20:18:42 +
+
 vtk9 (9.1.0+really9.1.0+dfsg2-7) unstable; urgency=medium
 
   * Team upload.
diff -Nru vtk9-9.1.0+really9.1.0+dfsg2/debian/control 
vtk9-9.1.0+really9.1.0+dfsg2/debian/control
--- vtk9-9.1.0+really9.1.0+dfsg2/debian/control 2023-08-21 19:01:21.0 
+
+++ vtk9-9.1.0+really9.1.0+dfsg2/debian/control 2024-02-05 20:18:42.0 
+
@@ -117,7 +117,7 @@
  libtheora-dev,
  libtiff-dev,
  libutfcpp-dev,
- libvtk9.1 (= ${binary:Version}),
+ libvtk9.1t64 (= ${binary:Version}),
  libvtk9-java (= ${binary:Version}) [!hppa !hurd-any !kfreebsd-any],
  libx11-dev,
  libxft-dev,
@@ -140,12 +140,13 @@
  This package provides the VTK header files required to compile
  C++ programs that use VTK to do 3D visualisation.
 
-Package: libvtk9.1
+Package: libvtk9.1t64
+Provides: ${t64:Provides}
 Architecture: any
 Multi-Arch: same
 Section: libs
-Breaks: libvtk9 (<< 9.1.0+really9.1.0)
-Replaces: libvtk9 (<< 9.1.0+really9.1.0)
+Breaks: libvtk9.1 (<< ${source:Version}), libvtk9 (<< 9.1.0+really9.1.0)
+Replaces: libvtk9.1, libvtk9 (<< 9.1.0+really9.1.0)
 Depends: ${misc:Depends},
  ${shlibs:Depends}
 Suggests: mpi-default-bin,
@@ -179,7 +180,7 @@
 Package: python3-vtk9
 Architecture: any
 Section: python
-Depends: libvtk9.1 (= ${binary:Version}),
+Depends: libvtk9.1t64 (= ${binary:Version}),
  python3-mpi4py,
  ${misc:Depends},
  ${python3:Depends},
@@ -200,7 +201,7 @@
 Package: vtk9
 Architecture: any
 Section: interpreters
-Depends: libvtk9.1 (= ${binary:Version}),
+Depends: libvtk9.1t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends}
 Suggests: vtk9-doc,
@@ -240,7 +241,11 @@
  .
  This package provides examples for VTK9
 
-Package: libvtk9.1-qt
+Package: libvtk9.1t64-qt
+Provides: ${t64:Provides}
+X-Time64-Compat: libvtk9.1-qt
+Replaces: libvtk9.1-qt
+Breaks: libvtk9.1-qt (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -258,7 +263,7 @@
 Multi-Arch: same
 Section: libdevel
 Depends: libvtk9-dev (= ${binary:Version}),
- libvtk9.1-qt (= ${binary:Version}),
+ libvtk9.1t64-qt (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
  qtbase5-dev,
diff -Nru vtk9-9.1.0+really9.1.0+dfsg2/debian/libvtk9.1-qt.install