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

diff --cc debian/changelog
index 5c20248589a8acb1983828fdaf2a768bdc698e79,3a6eebe4b339586ab3b490039a08b8ceb3891fc5..ef9f9185c9e2c0089abb9582d2cdd5e2d263a83e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- qscintilla2 (2.10.4+dfsg-2+rpi1) buster-staging; urgency=medium
++qscintilla2 (2.10.4+dfsg-2.1+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 05 Mar 2019 18:20:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 18 Jun 2019 09:24:35 +0000
++
+ qscintilla2 (2.10.4+dfsg-2.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * libqscintilla2-qt4-13: Add Breaks against libqscintilla2-3 from lenny
+     since some upgrade paths uncleanly delete files, causing debsums to
+     complain about missing /usr/share/qt4/translations/qscintilla_ru.qm.
+     (Closes: #925403)
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Sun, 16 Jun 2019 14:55:29 +0200
  
  qscintilla2 (2.10.4+dfsg-2) unstable; urgency=medium