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

[Carlos De Maine]

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

port to kf6

M  +27   -27   debian/control
M  +2    -2    debian/libkf5incidenceeditor-bin.install
M  +2    -2    debian/libkf5incidenceeditor-dev.install
M  +4    -8    debian/rules

https://invent.kde.org/neon/kde/incidenceeditor/-/commit/6f02503736b82e470c3a84beeae960ae58fc6a03

diff --git a/debian/control b/debian/control
index d67ed4d..32b429a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,27 +5,27 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
-               extra-cmake-modules (>= 5.19.0~),
+               kf6-codecs-dev,
+               kf6-extra-cmake-modules,
+               kf6-ki18n-dev,
+               kf6-ktextaddons-dev,
+               kpim6-akonadi-dev,
+               kpim6-akonadi-mime-dev,
+               kpim6-calendar-dev,
+               kpim6-calendarsupport-dev,
+               kpim6-calendarutils-dev,
+               kpim6-contacteditor-dev,
+               kpim6-eventviews-dev,
+               kpim6-grantleetheme-dev,
+               kpim6-kdepim-dev,
+               kpim6-ldap-dev,
+               kpim6-mailtransport-dev,
+               kpim6-mime-dev,
+               kpim6-pimcommon-dev,
                libkchart-dev,
-               libkf5akonadi-dev (>= 4:5.2.0~),
-               libkf5akonadimime-dev (>= 5.2.0~),
-               libkf5calendarcore-dev (>= 5.2.0~),
-               libkf5calendarsupport-dev (>= 5.2.0~),
-               libkf5calendarutils-dev (>= 5.2.0~),
-               libkf5codecs-dev (>= 5.19.0~),
-               libkf5contacteditor-dev (>= 17.04.0~),
-               libkf5eventviews-dev (>= 5.2.0~),
-               libkf5grantleetheme-dev,
-               libkf5i18n-dev (>= 5.19.0~),
-               libkf5ldap-dev (>= 5.2.0~),
-               libkf5libkdepim-dev (>= 5.2.0~),
-               libkf5ktextaddons-dev,
-               libkf5mailtransport-dev (>= 5.2.0~),
-               libkf5mime-dev (>= 5.2.0~),
-               libkf5pimcommon-dev,
                libkgantt-dev,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.4.0~)
+               pkg-kde-tools-neon,
+               qt6-base-dev
 Standards-Version: 3.9.8
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/incidenceeditor.git
@@ -55,14 +55,14 @@ Description: KDE PIM incidence editor
 Package: libkf5incidenceeditor-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5akonadi-dev (>= 4:5.2.0~),
-         libkf5akonadicalendar-dev,
-         libkf5calendarcore-dev (>= 5.2.0~),
-         libkf5eventviews-dev,
-         libkf5identitymanagement-dev,
-         libkf5incidenceeditor5 (= ${binary:Version}),
-         libkf5mailtransport-dev (>= 5.2.0~),
-         libkf5mime-dev (>= 5.2.0~),
+Depends: kpim6-akonadi-calendar-dev,
+         kpim6-akonadi-dev,
+         kpim6-calendar-dev,
+         kpim6-eventviews-dev,
+         kpim6-identitymanagement-dev,
+         kpim6-incidenceeditor (= ${binary:Version}),
+         kpim6-mailtransport-dev,
+         kpim6-mime-dev,
          libkgantt-dev,
          ${misc:Depends},
          ${shlibs:Depends}
diff --git a/debian/libkf5incidenceeditor-bin.install b/debian/libkf5incidenceeditor-bin.install
index 1f22850..060cfc4 100644
--- a/debian/libkf5incidenceeditor-bin.install
+++ b/debian/libkf5incidenceeditor-bin.install
@@ -1,2 +1,2 @@
-usr/share/qlogging-categories5/incidenceeditor.categories
-usr/share/qlogging-categories5/incidenceeditor.renamecategories
+usr/share/qlogging-categories6/incidenceeditor.categories
+usr/share/qlogging-categories6/incidenceeditor.renamecategories
diff --git a/debian/libkf5incidenceeditor-dev.install b/debian/libkf5incidenceeditor-dev.install
index 97b5676..26275ce 100644
--- a/debian/libkf5incidenceeditor-dev.install
+++ b/debian/libkf5incidenceeditor-dev.install
@@ -1,4 +1,4 @@
-usr/include/KPim5/IncidenceEditor/
+usr/include/KPim6/IncidenceEditor/
 usr/lib/*/cmake/KPim5IncidenceEditor/
 usr/lib/*/libKPim5IncidenceEditor.so
-usr/lib/*/qt5/mkspecs/modules/qt_IncidenceEditor.pri
+usr/lib/*/qt6/mkspecs/modules/qt_IncidenceEditor.pri
diff --git a/debian/rules b/debian/rules
index 30b95d6..3d69b0d 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +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:17.03.90-0~
-
-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:
-	# Disable dh_auto_test at build time
-	:
+%:
+	dh $@ --with kf6 --buildsystem kf6