Merge version 2.10.4+dfsg-1+rpi1 and 2.10.4+dfsg-2 to produce 2.10.4+dfsg-2+rpi1

diff --cc debian/changelog
index 963265c3f6c4723de0a71cbfa5da6abd7abcd8a4,532673fd106b17baa9bf7a90f6357dd94443254f..5c20248589a8acb1983828fdaf2a768bdc698e79
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,30 @@@
- qscintilla2 (2.10.4+dfsg-1+rpi1) buster-staging; urgency=medium
++qscintilla2 (2.10.4+dfsg-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.10.2+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 11 Jan 2018 16:07:42 +0000]
 +  * Add symbols file hack for Raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 28 Jun 2018 01:40:00 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 05 Mar 2019 18:20:32 +0000
++
+ qscintilla2 (2.10.4+dfsg-2) unstable; urgency=medium
+ 
+   [ Scott Kitterman ]
+   * Update symbols files from build logs (note: hppa not updated because the
+     hppa differences are due to Qt 5.10 not being built for hppa)
+   * Remove myself from uploaders
+ 
+   [ Ondřej Nový ]
+   * d/control: Remove ancient X-Python3-Version field
+   * d/watch: Use https protocol
+ 
+   [ Gudjon I. Gudjonsson ]
+   * Add a patch to link designer (Closes: #907172)
+   * Mark -l10n and -doc packages Multi-Arch: foreign. 
+     Thanks to Helmut Grohne (Closes: #912829)
+   * Bump standards version to 4.3.0.2, no changes needed
+   * Change debhelper dependency to 12
+   * Update symbols files from build log
+ 
+  -- Gudjon I. Gudjonsson <gudjon@gudjon.org>  Thu, 21 Feb 2019 19:34:03 +0100
  
  qscintilla2 (2.10.4+dfsg-1) unstable; urgency=medium