From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 31 Oct 2023 23:08:35 +0000 (+0000)
Subject: Merge version 2.13.3+dfsg-3+rpi1 and 2.14.1+dfsg-1 to produce 2.14.1+dfsg-1+rpi1
X-Git-Tag: archive/raspbian/2.14.1+dfsg-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=39e4d61e70430f9ce4fb6bb02be6ae6fbc085d07;p=qscintilla2.git

Merge version 2.13.3+dfsg-3+rpi1 and 2.14.1+dfsg-1 to produce 2.14.1+dfsg-1+rpi1
---

1ac42f6e6ae93332fc0509921edc5ed5fe3f1415
diff --cc debian/changelog
index e2aa7ee,0767b63..02c8066
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,11 +1,21 @@@
- qscintilla2 (2.13.3+dfsg-3+rpi1) bookworm-staging; urgency=medium
++qscintilla2 (2.14.1+dfsg-1+rpi1) trixie-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.
 +
 +  [changes introduced in 2.13.3+dfsg-3+rpi1 by Peter Michael Green]
 +  * Extend symbols file hack to cover qt6 packages.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Jan 2023 11:00:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 31 Oct 2023 23:08:34 +0000
++
+ qscintilla2 (2.14.1+dfsg-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Update symbols files for GCC 13 (closes: #1037827).
+   * Bump years in debian/copyright.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 22 Jul 2023 21:17:16 +0300
  
  qscintilla2 (2.13.3+dfsg-3) unstable; urgency=medium