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

[Harald Sitter]

Git commit e3153a2d32ee0ad7c3d4158c8cecfeaf4a3c494d by Harald Sitter.
Committed on 10/03/2023 at 14:54.
Pushed by sitter into branch 'Neon/unstable'.

port to kf6

M  +15   -15   debian/control
M  +6    -4    debian/rules

https://invent.kde.org/neon/kde/kactivitymanagerd/commit/e3153a2d32ee0ad7c3d4158c8cecfeaf4a3c494d

diff --git a/debian/control b/debian/control
index 39e0c4e..51ead8d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,20 +5,20 @@ 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.50.0~),
+               kf6-extra-cmake-modules,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kglobalaccel-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-kservice-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
                libboost-dev (>= 1.49~),
-               libkf5config-dev (>= 5.50.0~),
-               libkf5coreaddons-dev (>= 5.50.0~),
-               libkf5crash-dev (>= 5.50.0~),
-               libkf5dbusaddons-dev (>= 5.50.0~),
-               libkf5globalaccel-dev (>= 5.50.0~),
-               libkf5i18n-dev (>= 5.50.0~),
-               libkf5kio-dev (>= 5.50.0~),
-               libkf5service-dev,
-               libkf5windowsystem-dev (>= 5.50.0~),
-               libkf5xmlgui-dev (>= 5.50.0~),
-               pkg-kde-tools (>= 0.15.18~),
-               qtbase5-dev (>= 5.11.0~),
+               pkg-kde-tools-neon,
+               qt6-base-dev
 Standards-Version: 4.1.4
 Homepage: https://projects.kde.org/projects/kde/workspace/kactivitymanagerd
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kactivitymanagerd
@@ -26,11 +26,11 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kactivitymanagerd.git
 
 Package: kactivitymanagerd
 Architecture: any
-Depends: libqt5sql5-sqlite, ${misc:Depends}, ${shlibs:Depends}
+Depends: qt6-base, ${misc:Depends}, ${shlibs:Depends}
 Breaks: kactivities (<< 5.20~),
         libkactivities-bin,
         plasma-desktop (<< 4:5.14),
-        plasma-workspace (<< 4:5.14),
+        plasma-workspace (<< 4:5.14)
 Replaces: kactivities (<< 5.20~), libkactivities-bin
 Description: System service to manage user's activities
  System service to manage user's activities, track the usage patterns
diff --git a/debian/rules b/debian/rules
index 0c98761..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
+	dh $@ --with kf6 --buildsystem kf6
+
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/