[neon/extras/qca2/Neon/release] debian: drop old conflict

[Pino Toscano]

Git commit ee3c758e2b23f8457d0111c218e2834e38621906 by Pino Toscano.
Committed on 15/07/2023 at 07:43.
Pushed by jriddell into branch 'Neon/release'.

drop old conflict

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

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

diff --git a/debian/changelog b/debian/changelog
index 80091c0..5a0a3be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qca2 (2.3.6-3) UNRELEASED; urgency=medium
     - extend to also support Qt 6, and add a ciphertest-qt6 autopkgtest
   * Tweak the descriptions of all the Qt 5 & Qt 6 packages to mention the Qt
     version.
+  * Drop old qca-dev conflict in libqca-qt5-2-dev.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 15 Jul 2023 08:00:02 +0200
 
diff --git a/debian/control b/debian/control
index ff8a8a5..ef0ffdc 100644
--- a/debian/control
+++ b/debian/control
@@ -63,7 +63,6 @@ Section: libdevel
 Architecture: any
 Depends: libqca-qt5-2 (= ${binary:Version}), qtbase5-dev, ${misc:Depends}
 Suggests: libqca2-doc (= ${source:Version})
-Conflicts: qca-dev
 Description: development files for the Qt Cryptographic Architecture [Qt 5]
  The Qt Cryptographic Architecture (QCA) provides a straightforward and cross-
  platform API for a range of cryptographic features, including SSL/TLS,