Merge version 4:4.8.7+dfsg-17+rpi2 and 4:4.8.7+dfsg-18 to produce 4:4.8.7+dfsg-18...

diff --cc debian/changelog
index 9abbf72877f42b7ba88f8c8edb254f9e39d632d9,7fb24020c741837b1bf88e1a67168bd2cd3cfa42..1f9b70839916f94a102eb041fb46c2e913d7b4a9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,20 +1,30 @@@
- qt4-x11 (4:4.8.7+dfsg-17+rpi2) buster-staging; urgency=medium
++qt4-x11 (4:4.8.7+dfsg-18+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
++
++  [changes brought forward from 4:4.8.7+dfsg-17+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 14 Apr 2019 10:25:37 +0000]
 +  * Replace a number of occourances of "asm" with "__asm"
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 14 Apr 2019 10:25:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 15 Apr 2019 12:36:18 +0000
 +
- qt4-x11 (4:4.8.7+dfsg-17+rpi1) buster-staging; urgency=medium
+ qt4-x11 (4:4.8.7+dfsg-18) unstable; 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
+   * Team upload.
+ 
+   [ Edward Betts ]
+   * debian/NEWS: Replace UNRELEASED with unstable.
+ 
+   [ Alexander Volkov ]
+   * Backport some vulnerability fixes from Qt 5 (closes: #923003).
+     - CVE-2018-15518: double free or corruption in QXmlStreamReader.
+     - CVE-2018-19869: Qt Svg crash when parsing malformed url reference.
+     - CVE-2018-19870: NULL pointer dereference in QGifHandler.
+     - CVE-2018-19871: QTgaFile CPU exhaustion.
+     - CVE-2018-19872: crash when parsing a malformed PPM image.
+     - CVE-2018-19873: QBmpHandler segfault on malformed BMP file.
  
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 24 May 2018 12:03:16 +0000
+  -- Dmitry Shachnev <mitya57@debian.org>  Fri, 12 Apr 2019 23:10:28 +0300
  
  qt4-x11 (4:4.8.7+dfsg-17) unstable; urgency=medium
  

diff --cc debian/patches/series
Simple merge