From 12ba3261f1fce242bf087dae1b7dcb7c81701bdb Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Sun, 15 May 2022 17:48:39 +0300 Subject: [PATCH 1/4] Start a new changelog entry. --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 64e9c02..d4cc7d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,8 @@ +qt6-base (6.2.4+dfsg-8) UNRELEASED; urgency=medium + + + -- Debian Qt/KDE Maintainers Sun, 15 May 2022 17:48:31 +0300 + qt6-base (6.2.4+dfsg-7) unstable; urgency=medium * Team upload. From 9dd29dc83c53626081e0367b09eb7e08cbb283a1 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Sun, 15 May 2022 18:06:07 +0300 Subject: [PATCH 2/4] Disable relocatable feature, to fix paths on usr-merged systems. Thanks to Steven Trabert for the patch! Closes: #1010575. LP: #1970057. --- debian/changelog | 3 +++ debian/rules | 1 + 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index d4cc7d8..cbd4b08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ qt6-base (6.2.4+dfsg-8) UNRELEASED; urgency=medium + [ Dmitry Shachnev ] + * Disable relocatable feature, to fix paths on usr-merged systems. + Thanks to Steven Trabert for the patch! (Closes: #1010575, LP: #1970057) -- Debian Qt/KDE Maintainers Sun, 15 May 2022 17:48:31 +0300 diff --git a/debian/rules b/debian/rules index dca9eb5..360c7fd 100755 --- a/debian/rules +++ b/debian/rules @@ -71,6 +71,7 @@ override_dh_auto_configure: -DFEATURE_system_png=ON \ -DFEATURE_system_libb2=ON \ -DFEATURE_rpath=OFF \ + -DFEATURE_relocatable=OFF \ $(extra_cmake_args) From 89e887f33ece8f240e6690cfc8c0f7660b778e95 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Sun, 15 May 2022 18:11:45 +0300 Subject: [PATCH 3/4] Mark one inline symbol as optional to fix build on Ubuntu ppc64el. --- debian/changelog | 1 + debian/libqt6core6.symbols | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cbd4b08..f550a0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ qt6-base (6.2.4+dfsg-8) UNRELEASED; urgency=medium [ Dmitry Shachnev ] * Disable relocatable feature, to fix paths on usr-merged systems. Thanks to Steven Trabert for the patch! (Closes: #1010575, LP: #1970057) + * Mark one inline symbol as optional to fix build on Ubuntu ppc64el. -- Debian Qt/KDE Maintainers Sun, 15 May 2022 17:48:31 +0300 diff --git a/debian/libqt6core6.symbols b/debian/libqt6core6.symbols index cd89eae..f72bcc9 100644 --- a/debian/libqt6core6.symbols +++ b/debian/libqt6core6.symbols @@ -1158,7 +1158,7 @@ libQt6Core.so.6 libqt6core6 #MINVER# (subst)_ZN17QCborStreamReader7addDataEPKc{qptrdiff}@Qt_6 6.1.2 _ZN17QCborStreamReader7addDataERK10QByteArray@Qt_6 6.1.2 _ZN17QCborStreamReader7reparseEv@Qt_6 6.1.2 - _ZN17QCborStreamReader8preparseEv@Qt_6 6.1.2 + (optional=inline)_ZN17QCborStreamReader8preparseEv@Qt_6 6.1.2 _ZN17QCborStreamReader9lastErrorEv@Qt_6 6.1.2 _ZN17QCborStreamReader9setDeviceEP9QIODevice@Qt_6 6.1.2 _ZN17QCborStreamReaderC1EP9QIODevice@Qt_6 6.1.2 From fa07117b638c9fd0dc018731c4c82ec4c9bbcd37 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Mon, 23 May 2022 00:57:42 +0300 Subject: [PATCH 4/4] Release to unstable. --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f550a0b..ac49da7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -qt6-base (6.2.4+dfsg-8) UNRELEASED; urgency=medium +qt6-base (6.2.4+dfsg-8) unstable; urgency=medium - [ Dmitry Shachnev ] + * Team upload. * Disable relocatable feature, to fix paths on usr-merged systems. Thanks to Steven Trabert for the patch! (Closes: #1010575, LP: #1970057) * Mark one inline symbol as optional to fix build on Ubuntu ppc64el. - -- Debian Qt/KDE Maintainers Sun, 15 May 2022 17:48:31 +0300 + -- Dmitry Shachnev Mon, 23 May 2022 00:56:59 +0300 qt6-base (6.2.4+dfsg-7) unstable; urgency=medium