[neon/qt/qtbase/Neon/release] debian: Merge remote-tracking branch 'salsa/master' into Neon/release

[Jonathan Esk-Riddell]

Git commit cda3a391cc79925ea06f1f5a99b192d314e85a9c by Jonathan Esk-Riddell.
Committed on 05/05/2022 at 09:58.
Pushed by jriddell into branch 'Neon/release'.

Merge remote-tracking branch 'salsa/master' into Neon/release

M  +10   -5    debian/control
M  +6    -2    debian/rules

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

diff --cc debian/control
index 80a87b1,9990c3d..195fd34
--- a/debian/control
+++ b/debian/control
@@@ -368,12 -365,13 +369,13 @@@ Suggests: default-libmysqlclient-dev
            libpq-dev,
            libsqlite3-dev,
            unixodbc-dev
- Breaks: qt5-qmake (<< 5.11.3+dfsg-3~),
-         qtbase5-dev-tools (<< 5.14.0~),
-         qtbase5-private-dev (<< 5.12.3+dfsg-1+18.04+bionic+build57)
+ Breaks: qt5-default (<< 5.15.1+dfsg-2~),
+         qt5-qmake (<< 5.11.3+dfsg-3~),
+         qtbase5-dev-tools (<< 5.12.5+dfsg-3~),
+         qtbase5-private-dev (<< 5.11.3+dfsg-5~)
  Replaces: qt5-qmake (<< 5.11.3+dfsg-3~),
 -          qtbase5-dev-tools (<< 5.12.5+dfsg-3~),
 -          qtbase5-private-dev (<< 5.11.3+dfsg-5~)
 +          qtbase5-dev-tools (<< 5.14.0~),
 +          qtbase5-private-dev (<< 5.12.3+dfsg-1+18.04+bionic+build57)
  Conflicts: qtbase5-gles-dev
  Description: Qt 5 base development files
   Qt is a cross-platform C++ application framework. Qt's primary feature