Merge version 2.11.6+dfsg-3+rpi1 and 2.11.6+dfsg-4 to produce 2.11.6+dfsg-4+rpi1

diff --cc debian/changelog
index 10eb8a27c53409ce0fd6eaf74a7d9e85b2669a1d,857354a64871491c8dd4a40b3f57795165b25552..8a612fe3b0e6513671be05a21a31c04bccf51df0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- qscintilla2 (2.11.6+dfsg-3+rpi1) bookworm-staging; urgency=medium
++qscintilla2 (2.11.6+dfsg-4+rpi1) bookworm-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>  Thu, 23 Sep 2021 11:57:22 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 28 Oct 2021 17:41:06 +0000
++
+ qscintilla2 (2.11.6+dfsg-4) unstable; urgency=medium
+ 
+   * Team upload.
+   * Pass correct --target-dir to sip-build, to fix FTBFS with sip ≥ 6.2.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 23 Oct 2021 15:45:08 +0300
  
  qscintilla2 (2.11.6+dfsg-3) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge