[neon/extras/ktimetracker/Neon/unstable] debian: Revert "Revert "port to kf6""

[Carlos De Maine]

Git commit 39a082974b90a9ac44a240ebabef785f133ef692 by Carlos De Maine.
Committed on 04/01/2024 at 14:24.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "Revert "port to kf6""

This reverts commit 27569473f7a6b49b32b239da3eb104068189dc16.

M  +18   -18   debian/control
M  +3    -7    debian/rules
M  +10   -1    debian/tests/control

https://invent.kde.org/neon/extras/ktimetracker/-/commit/39a082974b90a9ac44a240ebabef785f133ef692

diff --git a/debian/control b/debian/control
index 8c2b496..e6bc8eb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,28 +2,28 @@ Source: ktimetracker
 Section: kde
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Pino Toscano <pino at debian.org>,
+Uploaders: Pino Toscano <pino at debian.org>
 Build-Depends: cmake (>= 3.5~),
                debhelper-compat (= 13),
-               extra-cmake-modules (>= 5.54.0~),
                gettext,
-               libkf5calendarcore-dev (>= 5:5.63.0~),
-               libkf5config-dev (>= 5.54.0~),
-               libkf5configwidgets-dev (>= 5.54.0~),
-               libkf5dbusaddons-dev (>= 5.54.0~),
-               libkf5doctools-dev (>= 5.54.0~),
-               libkf5i18n-dev (>= 5.54.0~),
-               libkf5idletime-dev (>= 5.54.0~),
-               libkf5jobwidgets-dev (>= 5.54.0~),
-               libkf5kio-dev (>= 5.54.0~),
-               libkf5notifications-dev (>= 5.54.0~),
-               libkf5textwidgets-dev (>= 5.54.0~),
-               libkf5windowsystem-dev (>= 5.54.0~),
-               libkf5xmlgui-dev (>= 5.54.0~),
-               pkg-kde-tools (>= 0.15.16),
-               qtbase5-dev (>= 5.10.0~),
+               kf6-extra-cmake-modules,
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kidletime-dev,
+               kf6-kio-dev,
+               kf6-kjobwidgets-dev,
+               kf6-knotifications-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               kpim6-calendar-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
                xauth,
-               xvfb,
+               xvfb
 Standards-Version: 4.5.1
 Rules-Requires-Root: no
 Homepage: https://userbase.kde.org/KTimeTracker
diff --git a/debian/rules b/debian/rules
index e0d2608..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,6 @@
 #!/usr/bin/make -f
-
-# Disable fixfilepath, as it triggers build failures.
-export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5
-
-override_dh_auto_test:
-	xvfb-run -a --server-args="-screen 0 1024x768x24+32" dh_auto_test
+	dh $@ --with kf6 --buildsystem kf6
diff --git a/debian/tests/control b/debian/tests/control
index e6c3728..87ca61f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,12 @@
 Tests: run-python-test
-Depends: @, dbus-x11, psmisc, python3, python3-pytest, pytest-benchmark, python3-pydbus, python3-webdav, xauth, xvfb
+Depends: dbus-x11,
+         psmisc,
+         pytest-benchmark,
+         python3,
+         python3-pydbus,
+         python3-pytest,
+         python3-webdav,
+         xauth,
+         xvfb,
+         @
 Restrictions: rw-build-tree