[neon/kde/akonadi-contacts/Neon/unstable] debian: port to kf6

[Carlos De Maine]

Git commit 3db02f9f858c73d255a80ddc74c503c1fa5f43bf by Carlos De Maine.
Committed on 24/09/2023 at 06:29.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +24   -24   debian/control
M  +4    -10   debian/rules

https://invent.kde.org/neon/kde/akonadi-contacts/-/commit/3db02f9f858c73d255a80ddc74c503c1fa5f43bf

diff --git a/debian/control b/debian/control
index a96fbda..ac372ba 100644
--- a/debian/control
+++ b/debian/control
@@ -10,26 +10,26 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 3.0~),
                debhelper (>= 11),
-               extra-cmake-modules (>= 5.47.0~),
+               kf6-codecs-dev,
+               kf6-extra-cmake-modules,
+               kf6-kcmutils-dev,
+               kf6-kcompletion-dev,
+               kf6-kdbusaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kio-dev,
+               kf6-ktextwidgets-dev,
+               kf6-prison-dev,
+               kpim6-akonadi-dev,
+               kpim6-akonadi-mime-dev,
+               kpim6-contacts-dev,
+               kpim6-kleo-dev,
+               kpim6-mime-dev,
                libgrantlee5-dev,
-               libkf5akonadi-dev (>= 4:18.08.3~),
-               libkf5akonadimime-dev (>= 4:17.12.3~),
-               libkf5codecs-dev (>= 5.47.0~),
-               libkf5completion-dev (>= 5.47.0~),
-               libkf5contacts-dev (>= 4:18.08.3~),
-               libkf5dbusaddons-dev (>= 5.47.0~),
                libkf5grantleetheme-dev,
-               libkf5i18n-dev (>= 5.47.0~),
-               libkf5iconthemes-dev (>= 5.47.0~),
-               libkf5kcmutils-dev,
-               libkf5kio-dev (>= 5.47.0~),
-               libkf5libkleo-dev,
-               libkf5mime-dev (>= 18.08.3~),
-               libkf5prison-dev (>= 5.47.0~),
-               libkf5textwidgets-dev (>= 5.47.0~),
                pkg-config,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.9.0~),
+               pkg-kde-tools-neon,
+               qt6-base-dev,
                xauth,
                xvfb
 Standards-Version: 4.3.0
@@ -72,11 +72,11 @@ Package: libkf5akonadicontact-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libgrantlee5-dev,
-         libkf5akonadi-dev (>= 4:18.08.3~),
-         libkf5akonadicontact5 (= ${binary:Version}),
-         libkf5contacteditor-dev,
-         libkf5contacts-dev (>= 4:18.08.3~),
+Depends: kpim6-akonadi-contact (= ${binary:Version}),
+         kpim6-akonadi-dev,
+         kpim6-contacteditor-dev,
+         kpim6-contacts-dev,
+         libgrantlee5-dev,
          libkf5grantleetheme-dev,
          ${misc:Depends}
 Description: Akonadi contacts access library - development files
@@ -123,8 +123,8 @@ Package: libkf5contacteditor-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5contacteditor5 (= ${binary:Version}),
-         libkf5contacts-dev,
+Depends: kpim6-contacteditor (= ${binary:Version}),
+         kpim6-contacts-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Akonadi contacts editor library - development files
diff --git a/debian/rules b/debian/rules
index c39fe7e..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-l10npkgs_firstversion_ok := 4:16.04.3-9~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
-
-override_dh_auto_test:
-	xvfb-run -- dh_auto_test --no-parallel
-
-override_dh_makeshlibs:
-	$(overridden_command) -Xkcm_akonadicontact_actions.so
+%:
+	dh $@ --with kf6 --buildsystem kf6