From: Raspbian forward pporter Date: Thu, 27 Sep 2018 15:45:33 +0000 (+0100) Subject: Merge version 5.11.1+dfsg-7+rpi1 and 5.11.1+dfsg-8 to produce 5.11.1+dfsg-8+rpi1 X-Git-Tag: archive/raspbian/5.11.1+dfsg-8+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=743a3e62405c87168b02d18126d688ee7dd7916e;p=qtbase-opensource-src.git Merge version 5.11.1+dfsg-7+rpi1 and 5.11.1+dfsg-8 to produce 5.11.1+dfsg-8+rpi1 --- 743a3e62405c87168b02d18126d688ee7dd7916e diff --cc debian/changelog index 36f957c44,c6093ff28..a44faa0e9 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,15 +1,25 @@@ - qtbase-opensource-src (5.11.1+dfsg-7+rpi1) buster-staging; urgency=medium ++qtbase-opensource-src (5.11.1+dfsg-8+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 Thu, 13 Sep 2018 16:25:16 +0000 ++ -- Raspbian forward porter Thu, 27 Sep 2018 15:45:32 +0000 ++ + qtbase-opensource-src (5.11.1+dfsg-8) unstable; urgency=medium + + * Override dh_auto_test to avoid compiling in indep builds. + * Refresh nonlinux_utime.diff. + * Update symbols files from buildds’ logs. + * Bump required qttools-dev-tools version to 5.11.1-6, where a bug in + qdoc was fixed (closes: #908328). + * Bump Standards-Version to 4.2.1, no changes needed. + * Temporarily use TLS1_2_VERSION instead of TLS_MAX_VERSION, to make + Qt Network work with OpenSSL 1.1.0 in testing (closes: #907774). + + -- Dmitry Shachnev Tue, 11 Sep 2018 13:29:28 +0300 qtbase-opensource-src (5.11.1+dfsg-7) unstable; urgency=medium diff --cc debian/patches/series index 07c11c140,fc9e97f6f..9fa84019f --- a/debian/patches/series +++ b/debian/patches/series @@@ -14,4 -14,4 +14,5 @@@ gnukfreebsd_linker_warnings.dif armv4.diff nonlinux_utime.diff no_arc4random_buf.diff + ssl_max_version.diff +modify-configure.json-to-disable-neon.patch