From: Peter Michael Green Date: Thu, 16 Aug 2018 10:43:47 +0000 (+0000) Subject: Manual merge of version 5.10.1+dfsg-7+rpi1 and 5.11.1+dfsg-6 to produce 5.11.1+dfsg... X-Git-Tag: archive/raspbian/5.11.1+dfsg-6+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e5b9f4f3f4b330727fdb029c4598b6338ef43dd5;p=qtbase-opensource-src.git Manual merge of version 5.10.1+dfsg-7+rpi1 and 5.11.1+dfsg-6 to produce 5.11.1+dfsg-6+rpi1 --- e5b9f4f3f4b330727fdb029c4598b6338ef43dd5 diff --cc configure.json index 5f4682e17,b4a87f550..7fec9cb2d --- a/configure.json +++ b/configure.json @@@ -1130,7 -1016,7 +1016,7 @@@ }, "neon": { "label": "NEON", - "condition": "(arch.arm64) && tests.neon", - "condition": "(arch.arm || arch.arm64) && subarch.neon", ++ "condition": "(arch.arm64) && subarch.neon", "output": [ "privateConfig", { "type": "define", "name": "QT_COMPILER_SUPPORTS_NEON", "value": 1 } diff --cc debian/changelog index 16855d085,7a02ca3e1..2f051fbbe --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,101 +1,111 @@@ - qtbase-opensource-src (5.10.1+dfsg-7+rpi1) buster-staging; urgency=medium ++qtbase-opensource-src (5.11.1+dfsg-6+rpi1) buster-staging; urgency=medium + + [changes introduced in 5.6.1+dfsg-2+rpi1] by Peter Michael Green] + * Partially fix clean target. + + [changes introduced in 5.9.1+dfsg-9+rpi1 by Peter Michael Green] + * Disable neon (-no-neon no longer seems to work, so edit configure.json instead) + - -- Raspbian forward porter Mon, 28 May 2018 00:18:09 +0000 ++ -- Raspbian forward porter Wed, 15 Aug 2018 01:17:28 +0000 ++ + qtbase-opensource-src (5.11.1+dfsg-6) unstable; urgency=medium + + * Upload to Sid. + + -- Simon Quigley Wed, 25 Jul 2018 04:49:30 -0500 + + qtbase-opensource-src (5.11.1+dfsg-5) experimental; urgency=medium + + [ Rohan Garg ] + * Update watch url to a better path. + + [ Simon Quigley ] + * Add patch fixing selection rendering issues if rounding leads to left-out + pixels. + + -- Simon Quigley Thu, 19 Jul 2018 23:33:59 -0500 + + qtbase-opensource-src (5.11.1+dfsg-4) experimental; urgency=medium + + * Add fix_regresion_in_QPointF_operator_equals.patch to fix wrong check in + QPointF (Closes: #903237). + * Update symbols files with buildds' logs. + + -- Lisandro Damián Nicanor Pérez Meyer Tue, 10 Jul 2018 10:19:04 -0300 + + qtbase-opensource-src (5.11.1+dfsg-3) experimental; urgency=medium + + * Bump Standards-version to 4.1.5, no changes needed. + * Revert an upstream commit which causes KMainWindow to save an invalid + window/widget state. This is per advice from upstream KDE and other + distributors who have done the same, but patches are being sent upstream + fixing the issue. + + -- Simon Quigley Thu, 05 Jul 2018 14:48:31 -0500 + + qtbase-opensource-src (5.11.1+dfsg-2) experimental; urgency=medium + + [ Dmitry Shachnev ] + * Fix version of qttools5-dev-tools build-dependency. + + [ Simon Quigley ] + * Remove the dbgsym migration section of debian/rules; it isn't needed + anymore. + * Bump the virtual ABI package to qtbase-abi-5-11-0 because symbols + were retracted. + * Update symbols from buildd logs. + + -- Simon Quigley Wed, 20 Jun 2018 14:14:42 -0500 + + qtbase-opensource-src (5.11.1+dfsg-1) experimental; urgency=medium + + [ Lisandro Damián Nicanor Pérez Meyer ] + * Change references to alioth/git.debian.org to salsa.debian.org. + + [ Dmitry Shachnev ] + * Configure with triplet-prefixed version of pkg-config (closes: #899382). + + [ Simon Quigley ] + * New upstream release. + * Bump build dependencies to 5.11.1. + * Add new file to debian/qtbase5-dev.install. + * Update symbols from build logs. + + -- Simon Quigley Tue, 19 Jun 2018 14:29:27 -0500 + + qtbase-opensource-src (5.11.0+dfsg-1) experimental; urgency=medium + + [ Dmitry Shachnev ] + * debian/copyright: Update for changed/removed files in 5.11. + + [ Lisandro Damián Nicanor Pérez Meyer ] + * Bump Build-Depends-Indep's Qt dependencies. + + [ Simon Quigley ] + * Update symbols from buildd logs. + * New upstream release. + * Bump build dependencies to 5.11.0. + + -- Simon Quigley Tue, 22 May 2018 18:19:48 -0500 + + qtbase-opensource-src (5.11.0~rc1+dfsg-1) experimental; urgency=medium + + * New upstream release candidate. + * Refresh patches for the new upstream release, and remove + reverse-applicable ones: + - dead_key_symbols.diff + - extend_mariadb_define_check.diff + - fix_loading_opengl.diff + - mesa_18.diff + - resources_for_examples.diff + * Update install files for new upstream files. + - Add new binary package qt5-flatpak-platformtheme. + * Bump debhelper compat to 11, no changes needed. + * Add my name to the copyright for the Debian packaging. + * Update copyright using debian/scripts/update-copyright. + * Update symbols from amd64 build logs. + + -- Simon Quigley Tue, 15 May 2018 23:08:16 -0500 qtbase-opensource-src (5.10.1+dfsg-7) unstable; urgency=medium