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

[Jonathan Riddell]

Git commit 6202c72ee78f07979fe456cbbbba72f1a9c6558d by Jonathan Riddell.
Committed on 16/05/2024 at 13:00.
Pushed by jriddell into branch 'Neon/release'.

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

M  +25   -0    debian/changelog
M  +2    -1    debian/control

https://invent.kde.org/neon/extras/qca2/-/commit/6202c72ee78f07979fe456cbbbba72f1a9c6558d

diff --cc debian/control
index 2c9fa18,3dd926f..01e80e2
--- a/debian/control
+++ b/debian/control
@@@ -9,12 -9,14 +9,13 @@@ Build-Depends: ca-certificates
                 gnupg <!nocheck>,
                 libsasl2-dev,
                 libssl-dev (>= 1.1.1~),
+                openssl <!nocheck>,
                 pkg-config,
                 pkg-kde-tools (>= 0.15.16),
 -               qtbase5-dev (>= 5.14.0~),
 -               qt6-base-dev,
                 qt6-5compat-dev,
 -Build-Depends-Indep: doxygen,
 -                     graphviz,
 +               qt6-base-dev,
 +               qtbase5-dev (>= 5.14.0~)
 +Build-Depends-Indep: doxygen, graphviz
  Build-Conflicts: libqca2-dev, qca-dev
  Standards-Version: 4.6.2
  Rules-Requires-Root: no