Bug#1062486: kf5-messagelib: NMU diff for 64-bit time_t transition

2024-03-22 Thread Benjamin Drung
Source: kf5-messagelib
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 buildd-unstable
  APT policy: (500, 'buildd-unstable'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-26-generic (SMP w/16 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: unable to detect
diff -Nru kf5-messagelib-22.12.3/debian/changelog 
kf5-messagelib-22.12.3/debian/changelog
--- kf5-messagelib-22.12.3/debian/changelog 2023-06-27 12:09:30.0 
+
+++ kf5-messagelib-22.12.3/debian/changelog 2024-03-22 14:26:18.0 
+
@@ -1,3 +1,10 @@
+kf5-messagelib (4:22.12.3-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062486
+
+ -- Benjamin Drung   Fri, 22 Mar 2024 14:26:18 +
+
 kf5-messagelib (4:22.12.3-2) unstable; urgency=medium
 
   * Add upstream patch to search also for subkeys (Closes: #1037363).
diff -Nru kf5-messagelib-22.12.3/debian/control 
kf5-messagelib-22.12.3/debian/control
--- kf5-messagelib-22.12.3/debian/control   2023-06-27 11:20:47.0 
+
+++ kf5-messagelib-22.12.3/debian/control   2024-03-22 14:26:18.0 
+
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers 
 Uploaders: Sandro Knauß ,
Patrick Franz ,
-Build-Depends: cmake (>= 3.16~),
+Build-Depends: dpkg-dev (>= 1.22.5), cmake (>= 3.16~),
debhelper-compat (= 13),
extra-cmake-modules (>= 5.99.0~),
git,
@@ -74,7 +74,7 @@
 Multi-Arch: same
 Depends: libkf5identitymanagement-dev (>= 22.12.3~),
  libkf5libkleo-dev (>= 4:22.12.3~),
- libkf5messagecomposer5abi1 (= ${binary:Version}),
+ libkf5messagecomposer5abi1t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: KDE PIM messaging library, composer devel files
@@ -83,7 +83,9 @@
  .
  This package is part of KDE PIM module.
 
-Package: libkf5messagecomposer5abi1
+Package: libkf5messagecomposer5abi1t64
+Replaces: libkf5messagecomposer5abi1
+Breaks: libkf5messagecomposer5abi1 (<< ${source:Version})
 X-Debian-ABI: 1
 X-CMake-Target: KF5MessageComposer
 Architecture: any
@@ -96,13 +98,13 @@
  message composing facilities.
  .
  This package is part of KDE PIM module.
-Provides: ${ABI:VirtualPackage},
+Provides: ${t64:Provides}, ${ABI:VirtualPackage},
 
 Package: libkf5messagecore-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5messagecore5abi1 (= ${binary:Version}),
+Depends: libkf5messagecore5abi1t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: KDE PIM messaging library, core devel files
@@ -111,7 +113,9 @@
  .
  This package is part of KDE PIM module.
 
-Package: libkf5messagecore5abi1
+Package: libkf5messagecore5abi1t64
+Replaces: libkf5messagecore5abi1
+Breaks: libkf5messagecore5abi1 (<< ${source:Version})
 X-Debian-ABI: 1
 X-CMake-Target: KF5MessageCore
 Architecture: any
@@ -124,14 +128,14 @@
  message handling facilities.
  .
  This package is part the KDE PIM module.
-Provides: ${ABI:VirtualPackage},
+Provides: ${t64:Provides}, ${ABI:VirtualPackage},
 
 Package: libkf5messagelist-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libkf5akonadi-dev (>= 4:22.12.3~),
- libkf5messagelist5abi1 (= ${binary:Version}),
+ libkf5messagelist5abi1t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: KDE PIM messaging library, message list devel files
@@ -141,7 +145,9 @@
  .
  This package is part of KDE PIM module.
 
-Package: libkf5messagelist5abi1
+Package: libkf5messagelist5abi1t64
+Replaces: libkf5messagelist5abi1
+Breaks: libkf5messagelist5abi1 (<< ${source:Version})
 X-Debian-ABI: 1
 X-CMake-Target: KF5MessageList
 Architecture: any
@@ -154,14 +160,14 @@
  e-mail message lists with extensive filtering, grouping and useful features.
  .
  This package is part of the KDE PIM module.
-Provides: ${ABI:VirtualPackage},
+Provides: ${t64:Provides}, ${ABI:VirtualPackage},
 
 Package: libkf5messageviewer-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libkf5messagecore-dev (= ${binary:Version}),
- libkf5messageviewer5abi1 (= ${binary:Version}),
+ libkf5messageviewer5abi1t64 (= ${binary:Version}),
  libkf5mimetreeparser-dev (= ${binary:Version}),
  libkf5pimcommon-dev (>= 4:22.12.3~),
  ${misc:Depends},
@@ -173,7 +179,9 @@
  .
  This package is part of KDE PIM module.
 
-Package: libkf5messageviewer5abi1

Bug#1062486: kf5-messagelib: NMU diff for 64-bit time_t transition

2024-02-01 Thread Graham Inggs
Source: kf5-messagelib
Version: 4:22.12.3-2
Severity: serious
Tags: patch pending
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t

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

Kernel: Linux 6.5.0-15-generic (SMP w/8 CPU threads; PREEMPT)
Kernel taint flags: 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: unable to detect
diff -Nru kf5-messagelib-22.12.3/debian/changelog 
kf5-messagelib-22.12.3/debian/changelog
--- kf5-messagelib-22.12.3/debian/changelog 2023-06-27 12:09:30.0 
+
+++ kf5-messagelib-22.12.3/debian/changelog 2024-02-01 16:53:29.0 
+
@@ -1,3 +1,10 @@
+kf5-messagelib (4:22.12.3-2.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Graham Inggs   Thu, 01 Feb 2024 16:53:29 +
+
 kf5-messagelib (4:22.12.3-2) unstable; urgency=medium
 
   * Add upstream patch to search also for subkeys (Closes: #1037363).
diff -Nru kf5-messagelib-22.12.3/debian/control 
kf5-messagelib-22.12.3/debian/control
--- kf5-messagelib-22.12.3/debian/control   2023-06-27 11:20:47.0 
+
+++ kf5-messagelib-22.12.3/debian/control   2024-02-01 16:53:28.0 
+
@@ -74,7 +74,7 @@
 Multi-Arch: same
 Depends: libkf5identitymanagement-dev (>= 22.12.3~),
  libkf5libkleo-dev (>= 4:22.12.3~),
- libkf5messagecomposer5abi1 (= ${binary:Version}),
+ libkf5messagecomposer5abi1t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: KDE PIM messaging library, composer devel files
@@ -83,7 +83,9 @@
  .
  This package is part of KDE PIM module.
 
-Package: libkf5messagecomposer5abi1
+Package: libkf5messagecomposer5abi1t64
+Replaces: libkf5messagecomposer5abi1
+Breaks: libkf5messagecomposer5abi1 (<< ${source:Version})
 X-Debian-ABI: 1
 X-CMake-Target: KF5MessageComposer
 Architecture: any
@@ -96,13 +98,13 @@
  message composing facilities.
  .
  This package is part of KDE PIM module.
-Provides: ${ABI:VirtualPackage},
+Provides: ${ABI:VirtualPackage},, ${t64:Provides}
 
 Package: libkf5messagecore-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5messagecore5abi1 (= ${binary:Version}),
+Depends: libkf5messagecore5abi1t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: KDE PIM messaging library, core devel files
@@ -111,7 +113,9 @@
  .
  This package is part of KDE PIM module.
 
-Package: libkf5messagecore5abi1
+Package: libkf5messagecore5abi1t64
+Replaces: libkf5messagecore5abi1
+Breaks: libkf5messagecore5abi1 (<< ${source:Version})
 X-Debian-ABI: 1
 X-CMake-Target: KF5MessageCore
 Architecture: any
@@ -124,14 +128,14 @@
  message handling facilities.
  .
  This package is part the KDE PIM module.
-Provides: ${ABI:VirtualPackage},
+Provides: ${ABI:VirtualPackage},, ${t64:Provides}
 
 Package: libkf5messagelist-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libkf5akonadi-dev (>= 4:22.12.3~),
- libkf5messagelist5abi1 (= ${binary:Version}),
+ libkf5messagelist5abi1t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: KDE PIM messaging library, message list devel files
@@ -141,7 +145,9 @@
  .
  This package is part of