From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 13 Sep 2018 16:25:17 +0000 (+0100)
Subject: Merge version 5.11.1+dfsg-6+rpi1 and 5.11.1+dfsg-7 to produce 5.11.1+dfsg-7+rpi1
X-Git-Tag: archive/raspbian/5.11.1+dfsg-7+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6e02439e5f947f58db95c9a97b79dd5208a2c2c7;p=qtbase-opensource-src.git

Merge version 5.11.1+dfsg-6+rpi1 and 5.11.1+dfsg-7 to produce 5.11.1+dfsg-7+rpi1
---

6e02439e5f947f58db95c9a97b79dd5208a2c2c7
diff --cc debian/changelog
index 2f051fbbe,1c81e1c4d..36f957c44
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,13 +1,23 @@@
- qtbase-opensource-src (5.11.1+dfsg-6+rpi1) buster-staging; urgency=medium
++qtbase-opensource-src (5.11.1+dfsg-7+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, 15 Aug 2018 01:17:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 13 Sep 2018 16:25:16 +0000
++
+ qtbase-opensource-src (5.11.1+dfsg-7) unstable; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Build depend upon libharfbuzz >= 1.6.0~ as required by the code
+     (Closes: #905660). Thanks Andreas Ferber for the bug report.
+ 
+   [ Simon Quigley ]
+   * Fix the build with glibc 2.28.
+ 
+  -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 25 Aug 2018 12:32:18 -0500
  
  qtbase-opensource-src (5.11.1+dfsg-6) unstable; urgency=medium