[neon/qt/qtbase/Neon/release] debian: merge salsa/master

[Jonathan Esk-Riddell]

Git commit a6f881dadc58487235b093b3fd9eebcddcc114e2 by Jonathan Esk-Riddell.
Committed on 14/07/2022 at 12:14.
Pushed by jriddell into branch 'Neon/release'.

merge salsa/master

M  +27   -4    debian/changelog
M  +2    -2    debian/control
M  +6    -0    debian/patches/series
M  +1    -0    debian/qtbase5-private-dev.install
M  +4    -0    debian/rules

https://invent.kde.org/neon/qt/qtbase/commit/a6f881dadc58487235b093b3fd9eebcddcc114e2

diff --cc debian/changelog
index 91521d5,d91a931..7fbe47b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -10,9 -27,12 +27,15 @@@ qtbase-opensource-src (5.15.4+dfsg-1) e
      - fix-invalid-pointer-return-with-QGridLayout.diff
      - gcc-11-qtconcurrentthreadengine.diff
    * Refresh other patches.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 12 May 2022 23:59:17 +0300
 +
+   * Bump ABI version to qtbase-abi-5-15-4.
+   * Update debian/copyright.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 13 May 2022 17:14:31 +0300
+ 
+ qtbase-opensource-src (5.15.3+dfsg-2) experimental; urgency=medium
  
    [ Andrea Pappacoda ]
    * Backport upstream patch to fix qtconcurrentthreadengine.h with GCC 11.
diff --cc debian/patches/series
index 451fbfe,4951636..089e5da
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,10 -1,19 +1,16 @@@
  # Backported from upstream.
  gcc_11_limits.diff
+ mime_globs.diff
  fix-misplacement-of-placeholder-text-in-QLineEdit.diff
  fix-placement-of-placeholder-text-in-QLineEdits-with-action-icons.diff
 -fusion_checkable_qpushbutton.diff
 -mysql_remove_version_checks.diff
  full_width_selection_rtl.diff
 -xcb_add_a_timeout_control_when_reading_INCR_property.diff
  fix_recursion_crash.diff
+ mysql_field_readonly.diff
+ CVE-2021-38593.diff
+ openssl3.diff
+ CVE-2022-25255.diff
  moc_handle_include.diff
+ remove_limit_on_number_of_streams.diff
  
  # Debian specific.
  gnukfreebsd.diff