From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 5 Feb 2021 10:01:14 +0000 (+0000)
Subject: Merge version 2.11.6+dfsg-1+rpi1 and 2.11.6+dfsg-2 to produce 2.11.6+dfsg-2+rpi1
X-Git-Tag: archive/raspbian/2.11.6+dfsg-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8305f43d7c558c94f1ef206b5cc59f2ef3263783;p=qscintilla2.git

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

8305f43d7c558c94f1ef206b5cc59f2ef3263783
diff --cc debian/changelog
index 1cd0f23,b9431a7..d2aa257
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- qscintilla2 (2.11.6+dfsg-1+rpi1) bullseye-staging; urgency=medium
++qscintilla2 (2.11.6+dfsg-2+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>  Thu, 10 Dec 2020 12:08:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Feb 2021 10:01:14 +0000
++
+ qscintilla2 (2.11.6+dfsg-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Build-depend on sip-tools instead of sip5-tools, in preparation for
+     SIP v6.
+   * Update debian/libqscintilla2-qt5-15.symbols from buildds’ logs.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 26 Jan 2021 20:22:23 +0300
  
  qscintilla2 (2.11.6+dfsg-1) unstable; urgency=medium