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

[Carlos De Maine]

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

port to kf6

M  +28   -28   debian/control
M  +2    -2    debian/libkf5calendarsupport-data.install
M  +2    -2    debian/libkf5calendarsupport-dev.install
M  +4    -4    debian/rules

https://invent.kde.org/neon/kde/calendarsupport/-/commit/521c176328ad04ed230a1d6d069d28cb22957848

diff --git a/debian/control b/debian/control
index 8248f7d..a5332f1 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 (>= 3.0~),
                debhelper (>= 11),
-               extra-cmake-modules (>= 5.47.0~),
-               libkf5akonadi-dev (>= 4:18.08.3~),
-               libkf5akonadicalendar-dev (>= 4:18.08.3~),
-               libkf5akonadimime-dev (>= 4:18.08.3~),
-               libkf5akonadinotes-dev,
-               libkf5calendarcore-dev (>= 4:18.08.3~),
-               libkf5calendarutils-dev (>= 4:18.08.3~),
-               libkf5codecs-dev (>= 5.47.0~),
-               libkf5guiaddons-dev (>= 5.47.0~),
-               libkf5holidays-dev (>= 1:5.47.0~),
-               libkf5i18n-dev (>= 5.47.0~),
-               libkf5iconthemes-dev (>= 5.47.0~),
-               libkf5identitymanagement-dev (>= 18.08.3~),
-               libkf5imap-dev (>= 18.08.3~),
-               libkf5kio-dev (>= 5.47.0~),
-               libkf5ktextaddons-dev,
-               libkf5mime-dev (>= 18.08.3~),
-               libkf5pimcommon-dev (>= 4:18.08.3~),
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.9.0~),
-               qttools5-dev (>= 5.9.0~)
+               kf6-codecs-dev,
+               kf6-extra-cmake-modules,
+               kf6-kguiaddons-dev,
+               kf6-kholidays-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kio-dev,
+               kf6-ktextaddons-dev,
+               kpim6-akonadi-calendar-dev,
+               kpim6-akonadi-dev,
+               kpim6-akonadi-mime-dev,
+               kpim6-akonadi-notes-dev,
+               kpim6-calendar-dev,
+               kpim6-calendarutils-dev,
+               kpim6-identitymanagement-dev,
+               kpim6-imap-dev,
+               kpim6-mime-dev,
+               kpim6-pimcommon-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-tools-dev
 Standards-Version: 4.3.0
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/calendarsupport
@@ -46,12 +46,12 @@ Package: libkf5calendarsupport-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5akonadi-dev (>= 4:18.08.3~),
-         libkf5akonadicalendar-dev (>= 4:18.08.3~),
-         libkf5calendarsupport5 (= ${binary:Version}),
-         libkf5identitymanagement-dev (>= 18.08.3~),
-         libkf5mime-dev (>= 18.08.3~),
-         qtbase5-dev (>= 5.9.0~),
+Depends: kpim6-akonadi-calendar-dev,
+         kpim6-akonadi-dev,
+         kpim6-calendarsupport (= ${binary:Version}),
+         kpim6-identitymanagement-dev,
+         kpim6-mime-dev,
+         qt6-base-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KDE PIM Calendar support - devel files
@@ -63,7 +63,7 @@ Breaks: libkf5eventviews-dev (<< 4:17.08)
 Package: libkf5calendarsupport5
 Architecture: any
 Multi-Arch: same
-Depends: libkf5calendarsupport-data (= ${source:Version}),
+Depends: kpim6-calendarsupport (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KDE PIM Calendar support - library
diff --git a/debian/libkf5calendarsupport-data.install b/debian/libkf5calendarsupport-data.install
index 821cea6..135b984 100644
--- a/debian/libkf5calendarsupport-data.install
+++ b/debian/libkf5calendarsupport-data.install
@@ -1,3 +1,3 @@
 usr/share/locale/
-usr/share/qlogging-categories5/calendarsupport.categories
-usr/share/qlogging-categories5/calendarsupport.renamecategories
+usr/share/qlogging-categories6/calendarsupport.categories
+usr/share/qlogging-categories6/calendarsupport.renamecategories
diff --git a/debian/libkf5calendarsupport-dev.install b/debian/libkf5calendarsupport-dev.install
index 6bf0449..f618440 100644
--- a/debian/libkf5calendarsupport-dev.install
+++ b/debian/libkf5calendarsupport-dev.install
@@ -1,5 +1,5 @@
-usr/include/KPim5/CalendarSupport/
+usr/include/KPim6/CalendarSupport/
 usr/lib/*/cmake/KF5CalendarSupport/
 usr/lib/*/cmake/KPim5CalendarSupport/
 usr/lib/*/libKPim5CalendarSupport.so
-usr/lib/*/qt5/mkspecs/modules/qt_CalendarSupport.pri
+usr/lib/*/qt6/mkspecs/modules/qt_CalendarSupport.pri
diff --git a/debian/rules b/debian/rules
index c8b9fc3..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +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
+%:
+	dh $@ --with kf6 --buildsystem kf6