From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 23 Sep 2021 11:57:23 +0000 (+0100)
Subject: Merge version 2.11.6+dfsg-2+rpi1 and 2.11.6+dfsg-3 to produce 2.11.6+dfsg-3+rpi1
X-Git-Tag: archive/raspbian/2.11.6+dfsg-3+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b25c5402963cba54fa06e9a3276c43ff7fc49651;p=qscintilla2.git

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

ace982a82889daa60c365a8edada512963f7113a
diff --cc debian/changelog
index d2aa257,5a73b07..10eb8a2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,28 @@@
- qscintilla2 (2.11.6+dfsg-2+rpi1) bullseye-staging; urgency=medium
++qscintilla2 (2.11.6+dfsg-3+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>  Fri, 05 Feb 2021 10:01:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 23 Sep 2021 11:57:22 +0000
++
+ qscintilla2 (2.11.6+dfsg-3) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Debian Janitor ]
+   * Apply multi-arch hints.
+     + libqscintilla2-qt5-designer, libqscintilla2-qt5-dev,
+       python3-pyqt5.qsci-dbg: Add Multi-Arch: same.
+ 
+   [ Dmitry Shachnev ]
+   * Update debian/watch to work with the new tarball naming scheme.
+   * Stop building extensions for Python debug interpreter (closes: #994372).
+     - Rely on automatic dbgsym packages for debug symbols.
+   * Update debian/libqscintilla2-qt5-15.symbols from the current build logs.
+   * Mark two symbols as optional to fix build with GCC 11 (closes: #984308).
+   * Bump Standards-Version to 4.6.0, no changes needed.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 18 Sep 2021 13:28:59 +0300
  
  qscintilla2 (2.11.6+dfsg-2) unstable; urgency=medium
  
diff --cc debian/rules
index e8f3792,13fa124..e02651d
--- a/debian/rules
+++ b/debian/rules
@@@ -97,11 -73,5 +76,11 @@@ execute_after_dh_installdocs-indep
  	dh_doxygen
  
  override_dh_strip:
- 	dh_strip -ppython3-pyqt5.qsci --dbg-package=python3-pyqt5.qsci-dbg
+ 	dh_strip -ppython3-pyqt5.qsci --dbgsym-migration='python3-pyqt5.qsci-dbg (<< 2.11.6+dfsg-3~)'
  	dh_strip --remaining-packages
 +
 +override_dh_auto_clean:
 +	dh_auto_clean
 +	sed -i 's/(optional=meh)/(arch=armel)/' debian/libqscintilla2-qt5-*.symbols
 +	sed -i 's/(optional=meh2)/(arch=!armel)/' debian/libqscintilla2-qt5-*.symbols
 +	sed -i 's/(optional=meh3)/(arch=!armel !riscv64)/' debian/libqscintilla2-qt5-*.symbols