[neon/neon-packaging/merkuro/Neon/unstable] debian: port to kf6

[Carlos De Maine]

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

port to kf6

M  +41   -42   debian/control
M  +1    -1    debian/merkuro.install
M  +1    -1    debian/merkuro.links
M  +3    -2    debian/rules

https://invent.kde.org/neon/neon-packaging/merkuro/-/commit/15f8ee0365eee61353332834542d0f2dd9dcc9b5

diff --git a/debian/control b/debian/control
index 0a315f3..e5e787a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,49 +4,48 @@ Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Build-Depends: cmake (>= 3.16~),
                debhelper-compat (= 12),
-               extra-cmake-modules (>= 5.86.0~),
+               kf6-extra-cmake-modules,
+               kf6-kconfigwidgets-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kdbusaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kirigami2-dev,
+               kf6-kitemmodels-dev,
+               kf6-knotifications-dev,
+               kf6-kservice-dev,
+               kf6-ktextaddons-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               kf6-plasma-framework-dev,
+               kf6-qqc2-desktop-style-dev,
                kirigami-addons-dev,
-               kirigami2-dev (>= 5.86.0~),
-               kf5-mimetreeparser-dev,
+               kpim6-akonadi-contact-dev,
+               kpim6-akonadi-dev,
+               kpim6-akonadicalendar,
+               kpim6-calendar-dev,
+               kpim6-calendarsupport-dev,
+               kpim6-contacts-dev,
+               kpim6-eventviews-dev,
+               kpim6-identitymanagement-dev,
+               kpim6-mailcommon-dev,
+               kpim6-mailtransport-dev,
+               kpim6-mbox-dev,
+               kpim6-messagecomposer-dev,
+               kpim6-messagelib-dev,
+               kpim6-mime-dev,
+               kpim6-mimetreeparser-dev,
+               kpim6-pimcommon-dev,
+               kpim6-templateparser-dev,
                libgpgme-dev,
                libgpgmepp-dev,
-               libkf5akonadi-dev (>= 4:21.08.0~),
-               libkf5akonadicalendar-bin,
-               libkf5akonadicontact-dev,
-               libkf5calendarcore-dev (>= 5:5.86.0~),
-               libkf5calendarsupport-dev (>= 4:21.08.0~),
-               libkf5configwidgets-dev (>= 5.86.0~),
-               libkf5contacts-dev (>= 5:5.86.0~),
-               libkf5coreaddons-dev (>= 5.86.0~),
-               libkf5dbusaddons-dev (>= 5.86.0~),
-               libkf5eventviews-dev (>= 4:21.08.0~),
-               libkf5mbox-dev,
-               libkf5i18n-dev (>= 5.86.0~),
-               libkf5iconthemes-dev (>= 5.86.0~),
-               libkf5identitymanagement-dev,
-               libkf5itemmodels-dev (>= 5.86.0~),
-               libkf5ktextaddons-dev,
-               libkf5mailcommon-dev,
-               libkf5messagecomposer-dev,
-               libkf5mime-dev,
-               libkf5notifications-dev (>= 5.86.0~),
-               libkf5mailtransport-dev,
-               libkf5pimcommon-dev,
-               libkf5plasma-dev,
-               libkf5qqc2desktopstyle-dev,
-               libkf5service-dev (>= 5.86.0~),
-               libkf5templateparser-dev,
-               libkf5webengineviewer-dev,
-               libkf5windowsystem-dev (>= 5.86.0~),
-               libkf5xmlgui-dev (>= 5.86.0~),
                libqgpgme-dev,
-               libqt5svg5-dev (>= 5.15.2~),
-               pkg-kde-tools,
-               qtbase5-dev (>= 5.15.2~),
-               qtdeclarative5-dev (>= 5.15.2~),
-               qtlocation5-dev (>= 5.15.2~),
-               qtpositioning5-dev (>= 5.15.2~),
-               qtquickcontrols2-5-dev (>= 5.15.2~)
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-location-dev,
+               qt6-positioning-dev,
+               qt6-svg-dev
 Standards-Version: 4.5.0
 Homepage: https://invent.kde.org/kde/merkuro
 Rules-Requires-Root: no
@@ -55,15 +54,15 @@ Package: merkuro
 Architecture: any
 Depends: akonadi-server,
          kdepim-runtime,
-         libkf5akonadicalendar-bin,
+         kpim6-akonadicalendar,
+         qml-module-org-kde-kidentitymanagement,
          qml-module-org-kde-kirigami-addons-datetime,
          qml-module-org-kde-kirigami-addons-delegates,
          qml-module-org-kde-kirigami-addons-labs-mobileform,
          qml-module-org-kde-kirigamiaddons,
          qml-module-org-kde-kitemmodels,
-         qml-module-qt-labs-qmlmodels,
-         qml-module-org-kde-kidentitymanagement,
          qml-module-org-kde-prison,
+         qml-module-qt-labs-qmlmodels,
          qml-module-qtlocation,
          qml-module-qtpositioning,
          qml-module-qtwebengine,
diff --git a/debian/merkuro.install b/debian/merkuro.install
index d7a0d79..1b91047 100644
--- a/debian/merkuro.install
+++ b/debian/merkuro.install
@@ -1 +1 @@
-usr/
\ No newline at end of file
+usr/
diff --git a/debian/merkuro.links b/debian/merkuro.links
index 6772b65..a7001f9 100644
--- a/debian/merkuro.links
+++ b/debian/merkuro.links
@@ -1 +1 @@
-usr/bin/merkuro-calendar usr/bin/kalendar
\ No newline at end of file
+usr/bin/merkuro-calendar usr/bin/kalendar
diff --git a/debian/rules b/debian/rules
index 45fe725..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5
+	dh $@ --with kf6 --buildsystem kf6