Bug#1064292: pyside2: NMU diff for 64-bit time_t transition
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')
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 pyside2-5.15.12/debian/changelog pyside2-5.15.12/debian/changelog
--- pyside2-5.15.12/debian/changelog 2024-02-08 08:13:11.000000000 +0000
+++ pyside2-5.15.12/debian/changelog 2024-03-02 00:27:01.000000000 +0000
@@ -1,3 +1,10 @@
+pyside2 (5.15.12-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1064292
+
+ -- Steve Langasek <vorlon@debian.org> Sat, 02 Mar 2024 00:27:01 +0000
+
pyside2 (5.15.12-6) unstable; urgency=medium
* Team upload.
diff -Nru pyside2-5.15.12/debian/control pyside2-5.15.12/debian/control
--- pyside2-5.15.12/debian/control 2024-02-08 08:13:11.000000000 +0000
+++ pyside2-5.15.12/debian/control 2024-03-02 00:27:01.000000000 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Kurt Kremitzki <kkremitzki@debian.org>
-Build-Depends: chrpath,
+Build-Depends: dpkg-dev (>= 1.22.5), chrpath,
cmake (>= 3.1),
debhelper-compat (= 13),
dh-python,
@@ -76,13 +76,14 @@
.
This package contains the common documentation package.
-Package: libpyside2-py3-5.15
+Package: libpyside2-py3-5.15t64
+Breaks: libpyside2-py3-5.15 (<< ${source:Version})
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
Conflicts: libpyside2-py3-5.11, libpyside2-py3-5.13, libpyside2-py3-5.14
-Replaces: libpyside2-py3-5.11, libpyside2-py3-5.13, libpyside2-py3-5.14
-Provides: libpyside2-py3
+Replaces: libpyside2-py3-5.15, libpyside2-py3-5.11, libpyside2-py3-5.13, libpyside2-py3-5.14
+Provides: ${t64:Provides}, libpyside2-py3
Description: Python 3 bindings for Qt5 (base files)
pyside2 provides Python bindings for Qt 5.x framework.
.
@@ -94,7 +95,7 @@
Package: libpyside2-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libpyside2-py3-5.15 (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libpyside2-py3-5.15t64 (= ${binary:Version})
Description: Python bindings for Qt5 (development files)
pyside2 provides Python bindings for Qt 5.x framework.
.
@@ -127,13 +128,14 @@
.
Shiboken2 is the binding generator used to create the PySide2 bindings.
-Package: libshiboken2-py3-5.15
+Package: libshiboken2-py3-5.15t64
+Breaks: libshiboken2-py3-5.15 (<< ${source:Version})
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
Conflicts: libshiboken2-py3-5.11, libshiboken2-py3-5.13, libshiboken2-py3-5.14
-Replaces: libshiboken2-py3-5.11, libshiboken2-py3-5.13, libshiboken2-py3-5.14
-Provides: libshiboken2-py3
+Replaces: libshiboken2-py3-5.15, libshiboken2-py3-5.11, libshiboken2-py3-5.13, libshiboken2-py3-5.14
+Provides: ${t64:Provides}, libshiboken2-py3
Description: CPython bindings generator for C++ libraries (Python3 shared library)
Shiboken2 is a bindings generator for C++ libraries that outputs CPython
source code. It collects information from library headers, and then
@@ -148,7 +150,7 @@
Section: libdevel
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends},
- libshiboken2-py3-5.15 (= ${binary:Version}), shiboken2 (= ${binary:Version}), python3-dev
+ libshiboken2-py3-5.15t64 (= ${binary:Version}), shiboken2 (= ${binary:Version}), python3-dev
Description: CPython bindings generator for C++ libraries (development files)
Shiboken2 is a bindings generator for C++ libraries that outputs CPython
source code. It collects information from library headers, and then
diff -Nru pyside2-5.15.12/debian/libpyside2-py3-5.15.install pyside2-5.15.12/debian/libpyside2-py3-5.15.install
--- pyside2-5.15.12/debian/libpyside2-py3-5.15.install 2024-02-08 08:13:11.000000000 +0000
+++ pyside2-5.15.12/debian/libpyside2-py3-5.15.install 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-pyside3_install/py3*-relwithdebinfo/lib/libpyside2*.so.* usr/lib/${DEB_HOST_MULTIARCH}
-pyside3_install/py3*-relwithdebinfo/lib/python*/site-packages/PySide2/_git_pyside_version.py usr/lib/python3/dist-packages/PySide2
-pyside3_install/py3*-relwithdebinfo/lib/python*/site-packages/PySide2/__init__.py usr/lib/python3/dist-packages/PySide2
-pyside3_install/py3*-relwithdebinfo/lib/python*/site-packages/PySide2/_config.py usr/lib/python3/dist-packages/PySide2
diff -Nru pyside2-5.15.12/debian/libpyside2-py3-5.15.lintian-overrides pyside2-5.15.12/debian/libpyside2-py3-5.15.lintian-overrides
--- pyside2-5.15.12/debian/libpyside2-py3-5.15.lintian-overrides 2024-02-08 08:13:11.000000000 +0000
+++ pyside2-5.15.12/debian/libpyside2-py3-5.15.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# We ship compiled versions for each supported python3 version, with a symlink to the default version
-package-name-doesnt-match-sonames *
diff -Nru pyside2-5.15.12/debian/libpyside2-py3-5.15t64.install pyside2-5.15.12/debian/libpyside2-py3-5.15t64.install
--- pyside2-5.15.12/debian/libpyside2-py3-5.15t64.install 1970-01-01 00:00:00.000000000 +0000
+++ pyside2-5.15.12/debian/libpyside2-py3-5.15t64.install 2024-02-08 08:13:11.000000000 +0000
@@ -0,0 +1,4 @@
+pyside3_install/py3*-relwithdebinfo/lib/libpyside2*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+pyside3_install/py3*-relwithdebinfo/lib/python*/site-packages/PySide2/_git_pyside_version.py usr/lib/python3/dist-packages/PySide2
+pyside3_install/py3*-relwithdebinfo/lib/python*/site-packages/PySide2/__init__.py usr/lib/python3/dist-packages/PySide2
+pyside3_install/py3*-relwithdebinfo/lib/python*/site-packages/PySide2/_config.py usr/lib/python3/dist-packages/PySide2
diff -Nru pyside2-5.15.12/debian/libpyside2-py3-5.15t64.lintian-overrides pyside2-5.15.12/debian/libpyside2-py3-5.15t64.lintian-overrides
--- pyside2-5.15.12/debian/libpyside2-py3-5.15t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ pyside2-5.15.12/debian/libpyside2-py3-5.15t64.lintian-overrides 2024-03-02 00:17:43.000000000 +0000
@@ -0,0 +1,3 @@
+# We ship compiled versions for each supported python3 version, with a symlink to the default version
+package-name-doesnt-match-sonames *
+libpyside2-py3-5.15t64: package-name-doesnt-match-sonames libpyside2-py3-5.15
diff -Nru pyside2-5.15.12/debian/libshiboken2-py3-5.15.install pyside2-5.15.12/debian/libshiboken2-py3-5.15.install
--- pyside2-5.15.12/debian/libshiboken2-py3-5.15.install 2024-02-08 08:13:11.000000000 +0000
+++ pyside2-5.15.12/debian/libshiboken2-py3-5.15.install 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-pyside3_install/py3*-relwithdebinfo/lib/libshiboken2*.so.* usr/lib/${DEB_HOST_MULTIARCH}
-pyside3_install/py3*-relwithdebinfo/lib/python3*/site-packages/shiboken2/* usr/lib/python3/dist-packages/shiboken2
diff -Nru pyside2-5.15.12/debian/libshiboken2-py3-5.15.lintian-overrides pyside2-5.15.12/debian/libshiboken2-py3-5.15.lintian-overrides
--- pyside2-5.15.12/debian/libshiboken2-py3-5.15.lintian-overrides 2024-02-08 08:13:11.000000000 +0000
+++ pyside2-5.15.12/debian/libshiboken2-py3-5.15.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# We ship compiled versions for each supported python3 version, with a symlink to the default version
-package-name-doesnt-match-sonames *
diff -Nru pyside2-5.15.12/debian/libshiboken2-py3-5.15t64.install pyside2-5.15.12/debian/libshiboken2-py3-5.15t64.install
--- pyside2-5.15.12/debian/libshiboken2-py3-5.15t64.install 1970-01-01 00:00:00.000000000 +0000
+++ pyside2-5.15.12/debian/libshiboken2-py3-5.15t64.install 2024-02-08 08:13:11.000000000 +0000
@@ -0,0 +1,2 @@
+pyside3_install/py3*-relwithdebinfo/lib/libshiboken2*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+pyside3_install/py3*-relwithdebinfo/lib/python3*/site-packages/shiboken2/* usr/lib/python3/dist-packages/shiboken2
diff -Nru pyside2-5.15.12/debian/libshiboken2-py3-5.15t64.lintian-overrides pyside2-5.15.12/debian/libshiboken2-py3-5.15t64.lintian-overrides
--- pyside2-5.15.12/debian/libshiboken2-py3-5.15t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ pyside2-5.15.12/debian/libshiboken2-py3-5.15t64.lintian-overrides 2024-03-02 00:17:43.000000000 +0000
@@ -0,0 +1,3 @@
+# We ship compiled versions for each supported python3 version, with a symlink to the default version
+package-name-doesnt-match-sonames *
+libshiboken2-py3-5.15t64: package-name-doesnt-match-sonames libshiboken2-py3-5.15
diff -Nru pyside2-5.15.12/debian/rules pyside2-5.15.12/debian/rules
--- pyside2-5.15.12/debian/rules 2024-02-08 08:13:11.000000000 +0000
+++ pyside2-5.15.12/debian/rules 2024-03-02 00:27:00.000000000 +0000
@@ -4,7 +4,7 @@
# Safety measure to ensure package names match SONAMEs
PYSIDE_MAJOR := $(shell echo $(DEB_VERSION_UPSTREAM) | cut -d. -f1-2)
-ifeq ($(shell awk '/Package:/ {print $$2}' debian/control | grep -- -$(PYSIDE_MAJOR)$$),)
+ifeq ($(shell awk '/Package:/ {print $$2}' debian/control | grep -- '-$(PYSIDE_MAJOR)\(t64\)\?$$'),)
$(error Please update package names for major version $(PYSIDE_MAJOR))
endif
ifeq ($(shell ls debian/lib* | grep -- -$(PYSIDE_MAJOR)),)
Reply to: