[neon/kde/akonadiconsole/Neon/unstable] debian: port to kf6

[Carlos De Maine]

Git commit e0e1a759b8ebde4b4c76124adb73b8f677e7b96c by Carlos De Maine.
Committed on 24/09/2023 at 08:04.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +32   -32   debian/control
M  +4    -11   debian/rules

https://invent.kde.org/neon/kde/akonadiconsole/-/commit/e0e1a759b8ebde4b4c76124adb73b8f677e7b96c

diff --git a/debian/control b/debian/control
index 531b50e..1e24a0f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,41 +10,41 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 3.1~),
                debhelper (>= 11),
-               extra-cmake-modules (>= 5.47.0~),
-               libkf5akonadi-dev (>= 4:18.08.3~),
-               libkf5akonadicontact-dev (>= 4:18.08.3~),
-               libkf5akonadimime-dev (>= 4:17.12.3~),
-               libkf5akonadisearch-dev (>= 4:18.08.3~),
-               libkf5calendarcore-dev (>= 4:18.08.3~),
-               libkf5calendarsupport-dev (>= 4:18.08.3~),
-               libkf5completion-dev (>= 5.47.0~),
-               libkf5config-dev (>= 5.47.0~),
-               libkf5configwidgets-dev (>= 5.47.0~),
-               libkf5contacts-dev (>= 4:18.08.3~),
-               libkf5crash-dev (>= 5.47.0~),
-               libkf5dbusaddons-dev (>= 5.47.0~),
-               libkf5doctools-dev (>= 5.47.0~),
-               libkf5grantleetheme-dev,
-               libkf5i18n-dev (>= 5.47.0~),
-               libkf5imap-dev (>= 17.12.3~),
-               libkf5itemmodels-dev (>= 5.47.0~),
-               libkf5itemviews-dev (>= 5.47.0~),
-               libkf5ktextaddons-dev,
-               libkf5kio-dev (>= 5.47.0~),
-               libkf5libkdepim-dev (>= 4:18.08.3~),
-               libkf5libkleo-dev (>= 4:17.12.3~),
-               libkf5messageviewer-dev (>= 4:18.08.3~),
-               libkf5mime-dev (>= 18.08.3~),
-               libkf5pimtextedit-dev (>= 17.12.3~),
-               libkf5textwidgets-dev (>= 5.47.0~),
-               libkf5webengineviewer-dev,
-               libkf5widgetsaddons-dev (>= 5.47.0~),
-               libkf5xmlgui-dev (>= 5.47.0~),
+               kf6-extra-cmake-modules,
+               kf6-kcompletion-dev,
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-kitemmodels-dev,
+               kf6-kitemviews-dev,
+               kf6-ktextaddons-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kxmlgui-dev,
+               kpim6-akonadi-contact-dev,
+               kpim6-akonadi-dev,
+               kpim6-akonadi-mime-dev,
+               kpim6-akonadi-search-dev,
+               kpim6-calendar-dev,
+               kpim6-calendarsupport-dev,
+               kpim6-contacts-dev,
+               kpim6-grantleetheme-dev,
+               kpim6-imap-dev,
+               kpim6-kdepim-dev,
+               kpim6-kleo-dev,
+               kpim6-messagelib-dev,
+               kpim6-messageviewer-dev,
+               kpim6-mime-dev,
+               kpim6-pimtextedit-dev,
                libqgpgme-dev,
                libxapian-dev,
                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
diff --git a/debian/rules b/debian/rules
index 8476ab9..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +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_strip:
-	$(overridden_command) --dbgsym-migration='akonadiconsole-dbg (<= 4:15.12.1-1~~)'
-
-override_dh_auto_test:
-	xvfb-run -a --server-args="-screen 0 1024x768x24 +extension GLX" --\
-	           dh_auto_test --no-parallel
+%:
+	dh $@ --with kf6 --buildsystem kf6