From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 26 Apr 2018 04:20:52 +0000 (+0100)
Subject: Merge version 4:4.8.7+dfsg-11+rpi1 and 4:4.8.7+dfsg-15 to produce 4:4.8.7+dfsg-15... 
X-Git-Tag: archive/raspbian/4%4.8.7+dfsg-15+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f729d1a24e45e3c0f8d9f77f3f2931c67f7966e0;p=qt4-x11.git

Merge version 4:4.8.7+dfsg-11+rpi1 and 4:4.8.7+dfsg-15 to produce 4:4.8.7+dfsg-15+rpi1
---

f729d1a24e45e3c0f8d9f77f3f2931c67f7966e0
diff --cc debian/changelog
index 2aec92bb9,372d5fb76..db39c8ecc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,31 +1,38 @@@
- qt4-x11 (4:4.8.7+dfsg-11+rpi1) stretch-staging; urgency=medium
++qt4-x11 (4:4.8.7+dfsg-15+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 4:4.8.6+git64-g5dc8b2b+dfsg-2+rpi1 by Peter Micheal Green <plugwash@raspbian.org> at Thu, 31 Jul 2014 22:56:54 +0000]
 +  * Disable neon
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 15 Nov 2016 19:34:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Apr 2018 04:20:50 +0000
++
+ qt4-x11 (4:4.8.7+dfsg-15) unstable; urgency=medium
+ 
+   * Actually upload it to unstable.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Wed, 18 Apr 2018 17:45:31 -0300
+ 
+ qt4-x11 (4:4.8.7+dfsg-14) experimental; urgency=medium
+ 
+   * Update symbols files with buildds' logs.
+   * Add NEWS.Debian to explicitely tell users of the OpenSSL 1.1 patch.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Wed, 18 Apr 2018 16:30:10 -0300
+ 
+ qt4-x11 (4:4.8.7+dfsg-13) experimental; urgency=medium
+ 
+   * Add extra patch from Dmitry Eremin-Solenikov to make Qt4 work with
+     OpenSSL 1.1 (Closes: #873275).
+   * Recommend default-libmysqlclient-dev instead of libmysqlclient-dev.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Fri, 10 Nov 2017 15:36:11 -0300
+ 
+ qt4-x11 (4:4.8.7+dfsg-12) experimental; urgency=medium
+ 
+   * Add openssl_1.1.patch to let Qt4 use OpenSSL 1.1 (Closes: #828522).
+     - Switch libssl-1.0-dev to libssl-dev to use OpenSSL 1.1.
+   * Update symbols files with current build log.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Tue, 15 Aug 2017 13:25:00 -0300
  
  qt4-x11 (4:4.8.7+dfsg-11) unstable; urgency=medium