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

[Carlos De Maine]

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

port to kf6

M  +15   -17   debian/control
M  +2    -2    debian/libkf5calendarutils-dev.install
M  +1    -1    debian/libkf5calendarutils5.install
M  +4    -11   debian/rules
M  +11   -3    debian/tests/control

https://invent.kde.org/neon/kde/kcalutils/-/commit/ff854509e6326855c710c4834c5bee59b8ba5419

diff --git a/debian/control b/debian/control
index 02c3eef..34f4762 100644
--- a/debian/control
+++ b/debian/control
@@ -5,20 +5,19 @@ 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~),
-               libgrantlee5-dev (>= 5.0~),
+               kf6-codecs-dev,
+               kf6-extra-cmake-modules,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-ki18n-dev,
+               kf6-ktextaddons-dev,
+               kf6-ktexttemplate-dev,
+               kpim6-calendar-dev,
+               kpim6-identitymanagement-dev,
+               kpim6-pimtextedit-dev,
                libical-dev,
-               libkf5calendarcore-dev (>= 5.2.0~),
-               libkf5codecs-dev (>= 5.19.0~),
-               libkf5config-dev (>= 5.19.0~),
-               libkf5coreaddons-dev (>= 5.19.0~),
-               libkf5i18n-dev (>= 5.19.0~),
-               libkf5identitymanagement-dev (>= 5.2.0~),
-               libkf5kdelibs4support-dev (>= 5.19.0~),
-               libkf5ktextaddons-dev,
-               libkf5pimtextedit-dev,
-               pkg-kde-tools (>> 0.15.15),
-               qtbase5-dev (>= 5.2.0~)
+               pkg-kde-tools-neon,
+               qt6-base-dev
 Standards-Version: 3.9.8
 Homepage: https://projects.kde.org/projects/kde/pim/kcalutils
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kcalutils.git
@@ -27,10 +26,9 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kcalutils.git
 Package: libkf5calendarutils-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5calendarcore-dev (>= 5.2.0~),
-         libkf5calendarutils5 (= ${binary:Version}),
-         libkf5coreaddons-dev (>= 5.19.0~),
-         libkf5kdelibs4support-dev (>= 5.19.0~),
+Depends: kf6-kcoreaddons-dev,
+         kpim6-calendar-dev,
+         kpim6-calendarutils (= ${binary:Version}),
          ${misc:Depends}
 Description: kcalutils - development files
  This library provides a set of utility functions that help applications access
diff --git a/debian/libkf5calendarutils-dev.install b/debian/libkf5calendarutils-dev.install
index f3642fa..fa41ab6 100644
--- a/debian/libkf5calendarutils-dev.install
+++ b/debian/libkf5calendarutils-dev.install
@@ -1,4 +1,4 @@
-usr/include/KPim5/KCalUtils/
+usr/include/KPim6/KCalUtils/
 usr/lib/*/cmake/KPim5CalendarUtils/
 usr/lib/*/libKPim5CalendarUtils.so
-usr/lib/*/qt5/mkspecs/modules/qt_KCalUtils.pri
+usr/lib/*/qt6/mkspecs/modules/qt_KCalUtils.pri
diff --git a/debian/libkf5calendarutils5.install b/debian/libkf5calendarutils5.install
index cc7a71c..1b6a38d 100644
--- a/debian/libkf5calendarutils5.install
+++ b/debian/libkf5calendarutils5.install
@@ -2,4 +2,4 @@ usr/lib/*/grantlee/*/kcalendar_grantlee_plugin.so
 usr/lib/*/libKPim5CalendarUtils.so.5
 usr/lib/*/libKPim5CalendarUtils.so.5.*
 usr/share/locale/
-usr/share/qlogging-categories5/
+usr/share/qlogging-categories6/
diff --git a/debian/rules b/debian/rules
index b087d68..3d69b0d 100644
--- 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: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_strip:
-	$(overridden_command) --dbgsym-migration='libkf5calendarutils-dbg (<= 15.12.1-1~~)'
-
-override_dh_auto_test:
-	# Disable auto test at build time, fakeroot breaks them
-	:
+%:
+	dh $@ --with kf6 --buildsystem kf6
diff --git a/debian/tests/control b/debian/tests/control
index db90199..b531616 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,13 @@
 Tests: testsuite
-Depends: @, @builddeps@, build-essential,
-         dbus-x11, xvfb, xauth, oxygen5-icon-theme, kded5, libgl1-mesa-dri,
-         kinit, plasma-framework
+Depends: build-essential,
+         dbus-x11,
+         kded5,
+         kinit,
+         libgl1-mesa-dri,
+         oxygen5-icon-theme,
+         plasma-framework,
+         xauth,
+         xvfb,
+         @,
+         @builddeps@
 Restrictions: build-needed