Merge version 4:4.8.7+dfsg-18+rpi1 and 4:4.8.7+dfsg-18+deb10u1 to produce 4:4.8.7...

diff --cc debian/changelog
index 1f9b70839916f94a102eb041fb46c2e913d7b4a9,c4d20f629f1b803d1d697a640154b27d37549798..89208302954a15da669c973f04b1f6cf20c7ea13
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- qt4-x11 (4:4.8.7+dfsg-18+rpi1) buster-staging; urgency=medium
++qt4-x11 (4:4.8.7+dfsg-18+rpi1+deb10u1) 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"
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 15 Apr 2019 12:36:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 27 Sep 2020 21:48:16 +0000
++
+ qt4-x11 (4:4.8.7+dfsg-18+deb10u1) buster; urgency=medium
+ 
+   * Backport upstream patch to fix buffer overflow in XBM parser, CVE-2020-17507
+     (Closes: #970308).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Mon, 14 Sep 2020 10:56:35 -0300
  
  qt4-x11 (4:4.8.7+dfsg-18) unstable; urgency=medium
  

diff --cc debian/patches/series
Simple merge