From: Peter Michael Green Date: Thu, 11 Sep 2025 22:04:26 +0000 (+0000) Subject: Manual merge of version 5.15.13+dfsg-2+rpi1 and 5.15.15+dfsg-3 to produce 5.15.15... X-Git-Tag: archive/raspbian/5.15.15+dfsg-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c291b9482dd02255837c7cecad33f41948002c5b;p=qt3d-opensource-src.git Manual merge of version 5.15.13+dfsg-2+rpi1 and 5.15.15+dfsg-3 to produce 5.15.15+dfsg-3+rpi1 --- c291b9482dd02255837c7cecad33f41948002c5b diff --cc debian/changelog index 66052f7,42f52c6..422a990 --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,23 +1,32 @@@ - qt3d-opensource-src (5.15.13+dfsg-2+rpi1) trixie-staging; urgency=medium ++qt3d-opensource-src (5.15.15+dfsg-3+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 5.15.1+dfsg-3+rpi1 by Peter Michael Green at Thu, 12 Nov 2020 12:19:45 +0000] + * Update symbols file for raspbian. + * Disable testsuite. + * Fix clean target. + - -- Raspbian forward porter Tue, 01 Oct 2024 20:53:20 +0000 ++ -- Peter Michael Green Thu, 11 Sep 2025 22:03:11 +0000 ++ + qt3d-opensource-src (5.15.15+dfsg-3) unstable; urgency=medium + + * Remove "+extension EGL" from xvfb-run call to fix build on armhf. + * Stop ignoring the tests result on s390x. + + -- Dmitry Shachnev Sun, 27 Oct 2024 17:12:01 +0300 + + qt3d-opensource-src (5.15.15+dfsg-2) unstable; urgency=medium + + * Upload to unstable. + + -- Dmitry Shachnev Fri, 25 Oct 2024 12:36:44 +0300 + + qt3d-opensource-src (5.15.15+dfsg-1) experimental; urgency=medium + + * New upstream release. + * Bump Qt build-dependencies to 5.15.15. + * Bump Standards-Version to 4.7.0, no changes needed. + + -- Dmitry Shachnev Fri, 06 Sep 2024 12:12:19 +0300 qt3d-opensource-src (5.15.13+dfsg-2) unstable; urgency=medium diff --cc debian/rules index b3f0746,5137093..7ba6acd --- a/debian/rules +++ b/debian/rules @@@ -29,13 -29,13 +29,13 @@@ override_dh_link dh_link --remaining-packages override_dh_auto_test-arch: - # Hangs on ppc*, s390x: https://bugreports.qt.io/browse/QTBUG-63864 - ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64 ppc64el s390x)) - #-xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX +extension EGL" \ + # Hangs on ppc*: https://bugreports.qt.io/browse/QTBUG-63864 + ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64 ppc64el)) - -xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \ - dh_auto_test --max-parallel=1 -- -Ctests/auto QT_PLUGIN_PATH=$(CURDIR)/plugins QML2_IMPORT_PATH=$(CURDIR)/qml ++ #-xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \ + #dh_auto_test --max-parallel=1 -- -Ctests/auto QT_PLUGIN_PATH=$(CURDIR)/plugins QML2_IMPORT_PATH=$(CURDIR)/qml else - #xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX +extension EGL" \ - xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \ - dh_auto_test --max-parallel=1 -- -Ctests/auto QT_PLUGIN_PATH=$(CURDIR)/plugins QML2_IMPORT_PATH=$(CURDIR)/qml ++ #xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \ + #dh_auto_test --max-parallel=1 -- -Ctests/auto QT_PLUGIN_PATH=$(CURDIR)/plugins QML2_IMPORT_PATH=$(CURDIR)/qml endif override_dh_auto_test-indep: