[neon/kde/kontact/Neon/unstable] debian: fix deps

[Scarlett Moore]

Git commit 7f8cf868b64c2e7dc52e56c61045b991d21d3782 by Scarlett Moore.
Committed on 26/09/2023 at 18:00.
Pushed by scarlettmoore into branch 'Neon/unstable'.

fix deps

M  +7    -0    debian/control

https://invent.kde.org/neon/kde/kontact/-/commit/7f8cf868b64c2e7dc52e56c61045b991d21d3782

diff --git a/debian/control b/debian/control
index b065b07..b6f577d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,14 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            George Kiagiadakis <kiagiadakis.george at gmail.com>,
            Eshat Cakar <info at eshat.de>,
            Maximiliano Curia <maxy at debian.org>
+<<<<<<< HEAD
 Build-Depends: cmake,
                debhelper-compat (= 13),
+=======
+Build-Depends: cmake (>= 2.8.12~),
+               debhelper-compat (= 12),
+               kf6-kcodecs-dev,
+>>>>>>> c7817b9 (fix deps)
                kf6-extra-cmake-modules,
                kf6-karchive-dev,
                kf6-kauth-dev,
@@ -43,6 +49,7 @@ Build-Depends: cmake,
                kpim6-eventviews-dev,
                kpim6-grantleetheme-dev,
                kpim6-kmimetreeparser-dev,
+               kpim6-libkdepim-dev,
                kpim6-kontactinterface-dev,
                kpim6-kpimtextedit-dev,
                kpim6-libkdepim-dev,