From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 25 Oct 2018 04:50:33 +0000 (+0100)
Subject: Merge version 5.11.1+dfsg-9+rpi1 and 5.11.2+dfsg-3 to produce 5.11.2+dfsg-3+rpi1
X-Git-Tag: archive/raspbian/5.11.2+dfsg-3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a6aba8755c03189502c1fe8b29338e09aa096d6d;p=qtbase-opensource-src.git

Merge version 5.11.1+dfsg-9+rpi1 and 5.11.2+dfsg-3 to produce 5.11.2+dfsg-3+rpi1
---

a6aba8755c03189502c1fe8b29338e09aa096d6d
diff --cc debian/changelog
index c30b0e39b,39eb167b3..ddd0094d4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,36 +1,46 @@@
- qtbase-opensource-src (5.11.1+dfsg-9+rpi1) buster-staging; urgency=medium
++qtbase-opensource-src (5.11.2+dfsg-3+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 <root@raspbian.org>  Wed, 03 Oct 2018 00:33:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 25 Oct 2018 04:50:32 +0000
++
+ qtbase-opensource-src (5.11.2+dfsg-3) unstable; urgency=medium
+ 
+   * Make `pkg-config --variable=host_bins Qt5Core`/qmake work with cross
+     compilation (closes: #909575):
+     - Patch Qt5Core.pc to make host_bins variable point to the multi-arch
+       location (/usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin).
+     - Make /usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/qmake point to
+       /usr/bin/${DEB_HOST_GNU_TYPE}-qmake. Also move this symlink from
+       qt5-qmake-bin to qt5-qmake.
+   * Correctly update symbols files for Vulkan symbols introduction.
+     Use arch-bits=32/64 where appropriate.
+   * Upload to unstable.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 15 Oct 2018 20:45:46 +0300
+ 
+ qtbase-opensource-src (5.11.2+dfsg-2) experimental; urgency=medium
+ 
+   * Bump ABI version to qtbase-abi-5-11-2.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 22 Sep 2018 09:21:33 +0300
+ 
+ qtbase-opensource-src (5.11.2+dfsg-1) experimental; urgency=medium
+ 
+   * New upstreaam release.
+   * Drop patches, applied upstream:
+     - fix_regresion_in_QPointF_operator_equals.patch
+     - fix-glibc-2.28-build.patch
+   * Refresh other patches.
+   * Update metadata for two patches wrongly marked as applied upstream.
+   * Update symbols files from buildds’ and the current build logs.
+   * Update debian/copyright.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Fri, 21 Sep 2018 10:57:47 +0300
  
  qtbase-opensource-src (5.11.1+dfsg-9) unstable; urgency=medium
  
diff --cc debian/patches/series
index 549058861,888dff9da..6b7adae97
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,11 -1,9 +1,8 @@@
  # Backported from upstream.
- hidpi_scale_at_192.diff
- Revert-QWidgetWindow-Immediately-forward-close-event.patch
- fix_regresion_in_QPointF_operator_equals.patch
  fix-selection-rendering.patch
- fix-glibc-2.28-build.patch
- fix_possible_heap_corruption_in_qxmlstream.patch
  
+ # Forwarded upstream.
+ hidpi_scale_at_192.diff
 -
  # Debian specific.
  gnukfreebsd.diff
  no_htmlinfo_example.diff
@@@ -16,4 -14,4 +13,5 @@@ armv4.dif
  nonlinux_utime.diff
  no_arc4random_buf.diff
  ssl_max_version.diff
+ Revert-QWidgetWindow-Immediately-forward-close-event.patch
 +modify-configure.json-to-disable-neon.patch