Merge version 2.11.2+dfsg-6+rpi1 and 2.11.2+dfsg-7 to produce 2.11.2+dfsg-7+rpi1

diff --cc debian/changelog
index e7a35b2d793ba0629ee5a0095aad4094906710b1,03612ee7cca93acc25f01a1ff167a424fa9e866c..a154283c1227ed6cb7b69e2f74f78ec289d4e512
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- qscintilla2 (2.11.2+dfsg-6+rpi1) bullseye-staging; urgency=medium
++qscintilla2 (2.11.2+dfsg-7+rpi1) bullseye-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>  Sun, 15 Mar 2020 02:47:40 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 25 Jun 2020 08:42:04 +0000
++
+ qscintilla2 (2.11.2+dfsg-7) unstable; urgency=medium
+ 
+   * Team upload.
+   * Update debian/watch to find latest releases properly.
+   * Add upstream patch to fix the Python signatures of the QsciAbstractAPIs
+     and QsciAPIs constructors (closes: #963300).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 23 Jun 2020 12:55:57 +0300
  
  qscintilla2 (2.11.2+dfsg-6) unstable; urgency=medium