Bug#1063217: peony: NMU diff for 64-bit time_t transition

2024-02-29 Thread Benjamin Drung
Source: peony
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 peony-4.0.0.0/debian/changelog peony-4.0.0.0/debian/changelog
--- peony-4.0.0.0/debian/changelog  2024-01-23 02:42:22.0 +
+++ peony-4.0.0.0/debian/changelog  2024-02-29 20:19:01.0 +
@@ -1,3 +1,10 @@
+peony (4.0.0.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063217
+
+ -- Benjamin Drung   Thu, 29 Feb 2024 20:19:01 +
+
 peony (4.0.0.0-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru peony-4.0.0.0/debian/control peony-4.0.0.0/debian/control
--- peony-4.0.0.0/debian/control2024-01-23 02:42:22.0 +
+++ peony-4.0.0.0/debian/control2024-02-29 20:19:01.0 +
@@ -5,7 +5,7 @@
 Uploaders: Aron Xu ,
handsome_feng ,
xibowen 
-Build-Depends: debhelper-compat (=13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (=13),
libbamf3-dev,
libcanberra-dev,
libdconf-dev,
@@ -44,7 +44,7 @@
 Package: peony
 Architecture: any
 Multi-Arch: foreign
-Depends: libpeony3 (= ${binary:Version}),
+Depends: libpeony3t64 (= ${binary:Version}),
  peony-common (= ${source:Version}),
  ${misc:Depends},
  ${shlibs:Depends}
@@ -69,7 +69,7 @@
  .
  This package contains the architecture independent files.
 
-Package: libpeony3
+Package: libpeony3t64
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
@@ -79,9 +79,9 @@
  gvfs-fuse,
  ${misc:Depends},
  ${shlibs:Depends}
-Provides: libpeony
-Breaks: libpeony2, peony (<< 2.2.0-1)
-Replaces: libpeony2, peony (<< 2.2.0-1)
+Provides: ${t64:Provides}, libpeony
+Breaks: libpeony3 (<< ${source:Version}), libpeony2, peony (<< 2.2.0-1)
+Replaces: libpeony3, libpeony2, peony (<< 2.2.0-1)
 Description: libraries for Peony components
  Peony is the official file manager for the UKUI desktop. It allows one
  to browse directories, preview files and launch applications associated
@@ -99,7 +99,7 @@
  libglib2.0-dev,
  libgsettings-qt-dev,
  libnotify-dev,
- libpeony3 (= ${binary:Version}),
+ libpeony3t64 (= ${binary:Version}),
  libpoppler-qt5-dev,
  libudisks2-dev,
  qtbase5-dev,
diff -Nru peony-4.0.0.0/debian/libpeony3.install 
peony-4.0.0.0/debian/libpeony3.install
--- peony-4.0.0.0/debian/libpeony3.install  2024-01-17 02:42:10.0 
+
+++ peony-4.0.0.0/debian/libpeony3.install  1970-01-01 00:00:00.0 
+
@@ -1,3 +0,0 @@
-translations/libpeony-qt/* usr/share/libpeony-qt
-usr/lib/*/*.so.*
-usr/share/libpeony-qt/*.qm
diff -Nru peony-4.0.0.0/debian/libpeony3.shlibs 
peony-4.0.0.0/debian/libpeony3.shlibs
--- peony-4.0.0.0/debian/libpeony3.shlibs   2024-01-17 02:42:10.0 
+
+++ peony-4.0.0.0/debian/libpeony3.shlibs   1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-libpeony 3 libpeony3 (>= 3.0.2)
diff -Nru peony-4.0.0.0/debian/libpeony3t64.install 
peony-4.0.0.0/debian/libpeony3t64.install
--- peony-4.0.0.0/debian/libpeony3t64.install   1970-01-01 00:00:00.0 
+
+++ peony-4.0.0.0/debian/libpeony3t64.install   2024-01-17 02:42:10.0 
+
@@ -0,0 +1,3 @@
+translations/libpeony-qt/* usr/share/libpeony-qt
+usr/lib/*/*.so.*
+usr/share/libpeony-qt/*.qm
diff -Nru peony-4.0.0.0/debian/libpeony3t64.lintian-overrides 
peony-4.0.0.0/debian/libpeony3t64.lintian-overrides
--- peony-4.0.0.0/debian/libpeony3t64.lintian-overrides 1970-01-01 
00:00:00.0 +
+++ peony-4.0.0.0/debian/libpeony3t64.lintian-overrides 2024-02-29 
20:18:47.0 +
@@ -0,0 +1 @@
+libpeony3t64: package-name-doesnt-match-sonames libpeony3
diff -Nru peony-4.0.0.0/debian/libpeony3t64.shlibs 
peony-4.0.0.0/debian/libpeony3t64.shlibs
--- peony-4.0.0.0/debian/libpeony3t64.shlibs1970-01-01 00:00:00.0 
+
+++ peony-4.0.0.0/debian/libpeony3t64.shlibs2024-02-29 20:18:47.0 
+
@@ -0,0 +1 @@
+libpeony 3 libpeony3t64 (>= 3.0.2)


Bug#1063217: peony: NMU diff for 64-bit time_t transition

2024-02-05 Thread Lucas Kanashiro
Source: peony
Version: 4.0.0.0-1
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
peony 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 peony
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.2.0-39-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 peony-4.0.0.0/debian/changelog peony-4.0.0.0/debian/changelog
--- peony-4.0.0.0/debian/changelog  2024-01-22 23:42:22.0 -0300
+++ peony-4.0.0.0/debian/changelog  2024-02-05 15:10:29.0 -0300
@@ -1,3 +1,10 @@
+peony (4.0.0.0-1.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Lucas Kanashiro   Mon, 05 Feb 2024 15:10:29 -0300
+
 peony (4.0.0.0-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru peony-4.0.0.0/debian/control peony-4.0.0.0/debian/control
--- peony-4.0.0.0/debian/control2024-01-22 23:42:22.0 -0300
+++ peony-4.0.0.0/debian/control2024-02-05 15:10:28.0 -0300
@@ -44,7 +44,7 @@
 Package: peony
 Architecture: any
 Multi-Arch: foreign
-Depends: libpeony3 (= ${binary:Version}),
+Depends: libpeony3t64 (= ${binary:Version}),
  peony-common (= ${source:Version}),
  ${misc:Depends},
  ${shlibs:Depends}
@@ -69,7 +69,7 @@
  .
  This package contains the architecture independent files.
 
-Package: libpeony3
+Package: libpeony3t64
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
@@ -79,9 +79,9 @@
  gvfs-fuse,
  ${misc:Depends},
  ${shlibs:Depends}
-Provides: libpeony
-Breaks: libpeony2, peony (<< 2.2.0-1)
-Replaces: libpeony2, peony (<< 2.2.0-1)
+Provides: ${t64:Provides}, libpeony
+Breaks: libpeony3 (<< ${source:Version}), libpeony2, peony (<< 2.2.0-1)
+Replaces: libpeony3, libpeony2, peony (<< 2.2.0-1)
 Description: libraries for Peony components
  Peony is the official file manager for the UKUI desktop. It allows one
  to browse directories, preview files and launch applications associated
@@ -99,7 +99,7 @@
  libglib2.0-dev,
  libgsettings-qt-dev,
  libnotify-dev,
- libpeony3 (= ${binary:Version}),
+ libpeony3t64 (= ${binary:Version}),
  libpoppler-qt5-dev,
  libudisks2-dev,
  qtbase5-dev,
diff -Nru peony-4.0.0.0/debian/libpeony3.install 
peony-4.0.0.0/debian/libpeony3.install
--- peony-4.0.0.0/debian/libpeony3.install  2024-01-16 23:42:10.0 
-0300
+++ peony-4.0.0.0/debian/libpeony3.install  1969-12-31 21:00:00.0 
-0300
@@ -1,3 +0,0 @@
-translations/libpeony-qt/* usr/share/libpeony-qt
-usr/lib/*/*.so.*
-usr/share/libpeony-qt/*.qm
diff -Nru peony-4.0.0.0/debian/libpeony3.shlibs 
peony-4.0.0.0/debian/libpeony3.shlibs
--- peony-4.0.0.0/debian/libpeony3.shlibs   2024-01-16 23:42:10.0 
-0300
+++ peony-4.0.0.0/debian/libpeony3.shlibs   1969-12-31 21:00:00.0 
-0300
@@ -1 +0,0 @@
-libpeony 3 libpeony3 (>= 3.0.2)
diff -Nru peony-4.0.0.0/debian/libpeony3t64.install 
peony-4.0.0.0/debian/libpeony3t64.install
--- peony-4.0.0.0/debian/libpeony3t64.install   1969-12-31 21:00:00.0 
-0300
+++