From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 28 Oct 2021 17:41:06 +0000 (+0100)
Subject: Merge version 2.11.6+dfsg-3+rpi1 and 2.11.6+dfsg-4 to produce 2.11.6+dfsg-4+rpi1
X-Git-Tag: archive/raspbian/2.11.6+dfsg-4+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=43ac78106094d0ff32c033f83a6430f72ed3772c;p=qscintilla2.git

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

43ac78106094d0ff32c033f83a6430f72ed3772c
diff --cc debian/changelog
index 10eb8a2,857354a..8a612fe
--- a/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