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

[Carlos De Maine]

Git commit 3f7735441172a26fd48345d8496e71020fe75235 by Carlos De Maine.
Committed on 14/03/2023 at 00:59.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +19   -21   debian/control
M  +9    -9    debian/kde-config-screenlocker.install
M  +5    -5    debian/kscreenlocker-dev.install
M  +4    -4    debian/libkscreenlocker5.install
M  +5    -12   debian/rules

https://invent.kde.org/neon/kde/kscreenlocker/commit/3f7735441172a26fd48345d8496e71020fe75235

diff --git a/debian/control b/debian/control
index dfe9ccb..aa680ed 100644
--- a/debian/control
+++ b/debian/control
@@ -5,25 +5,23 @@ 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~),
-               libkf5crash-dev (>= 5.50.0~),
-               libkf5declarative-dev (>= 5.50.0~),
-               libkf5globalaccel-dev (>= 5.50.0~),
-               libkf5i18n-dev (>= 5.50.0~),
-               libkf5idletime-dev (>= 5.50.0~),
-               libkf5kcmutils-dev (>= 5.50.0~),
-               libkf5kdelibs4support-dev (>= 5.18.0~),
-               libkf5notifications-dev (>= 5.50.0~),
-               libkf5plasma-dev (>= 5.18.0~),
-               libkf5screen-dev,
-               libkf5solid-dev (>= 5.50.0~),
-               libkf5textwidgets-dev (>= 5.50.0~),
-               libkf5wayland-dev (>= 4:5.5.1~),
-               libkf5windowsystem-dev (>= 5.50.0~),
-               libkf5xmlgui-dev (>= 5.50.0~),
+               kf6-extra-cmake-modules,
+               kf6-kcmutils-dev,
+               kf6-kcrash-dev,
+               kf6-kdeclarative-dev,
+               kf6-kglobalaccel-dev,
+               kf6-ki18n-dev,
+               kf6-kidletime-dev,
+               kf6-knotifications-dev,
+               kf6-kscreen-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kwayland-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               kf6-plasma-framework-dev,
+               kf6-solid-dev,
                liblayershellqtinterface-dev,
                libpam0g-dev,
-               libqt5x11extras5-dev (>= 5.11.0~),
                libseccomp-dev,
                libwayland-dev (>= 1.3~),
                libx11-dev,
@@ -33,9 +31,9 @@ Build-Depends: cmake (>= 3.0~),
                libxcursor-dev,
                libxi-dev,
                pkg-config,
-               pkg-kde-tools,
-               qtbase5-dev (>= 5.11.0~),
-               qtdeclarative5-dev (>= 5.11.0~)
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev
 Standards-Version: 4.1.3
 Homepage: https://projects.kde.org/kscreenlocker
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kscreenlocker.git
@@ -61,7 +59,7 @@ Package: kscreenlocker-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkscreenlocker5 (= ${binary:Version}), qtbase5-dev, ${misc:Depends}
+Depends: libkscreenlocker5 (= ${binary:Version}), qt6-base-dev, ${misc:Depends}
 Breaks: plasma-workspace-dev (<= 4:5.5.0~)
 Replaces: plasma-workspace-dev (<= 4:5.5.0~)
 Description: Development files for kscreenlocker
diff --git a/debian/kde-config-screenlocker.install b/debian/kde-config-screenlocker.install
index 7a8a9b7..6627b21 100644
--- a/debian/kde-config-screenlocker.install
+++ b/debian/kde-config-screenlocker.install
@@ -1,9 +1,9 @@
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings/kcm_screenlocker.so
-usr/share/applications/kcm_screenlocker.desktop
-usr/share/kconf_update/*
-usr/share/knotifications5/*
-usr/share/kpackage/
-usr/share/ksmserver/*
-usr/share/locale/*/*/kcm_screenlocker.mo
-usr/share/locale/*/*/kscreenlocker.mo
-usr/share/locale/*/*/kscreenlocker_greet.mo
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_screenlocker.so
+usr/kf6/share/applications/kcm_screenlocker.desktop
+usr/kf6/share/kconf_update/*
+usr/kf6/share/knotifications6/*
+usr/kf6/share/kpackage/
+usr/kf6/share/ksmserver/*
+usr/kf6/share/locale/*/*/kcm_screenlocker.mo
+usr/kf6/share/locale/*/*/kscreenlocker.mo
+usr/kf6/share/locale/*/*/kscreenlocker_greet.mo
diff --git a/debian/kscreenlocker-dev.install b/debian/kscreenlocker-dev.install
index 23a2dde..3a64095 100644
--- a/debian/kscreenlocker-dev.install
+++ b/debian/kscreenlocker-dev.install
@@ -1,5 +1,5 @@
-usr/include/*
-usr/lib/*/cmake/KScreenLocker/*
-usr/lib/*/cmake/ScreenSaverDBusInterface/
-usr/lib/*/libKScreenLocker.so
-usr/share/dbus-1/interfaces/*
+usr/kf6/include/*
+usr/kf6/lib/*/cmake/KScreenLocker/*
+usr/kf6/lib/*/cmake/ScreenSaverDBusInterface/
+usr/kf6/lib/*/libKScreenLocker.so
+usr/kf6/share/dbus-1/interfaces/*
diff --git a/debian/libkscreenlocker5.install b/debian/libkscreenlocker5.install
index 784abb1..71f3930 100644
--- a/debian/libkscreenlocker5.install
+++ b/debian/libkscreenlocker5.install
@@ -1,4 +1,4 @@
-usr/lib/*/libKScreenLocker.so.5
-usr/lib/*/libKScreenLocker.so.5.*
-usr/lib/*/libexec/
-usr/share/qlogging-categories5/kscreenlocker.categories
+usr/kf6/lib/*/libKScreenLocker.so.5
+usr/kf6/lib/*/libKScreenLocker.so.5.*
+usr/kf6/lib/*/libexec/
+usr/kf6/share/qlogging-categories5/kscreenlocker.categories
diff --git a/debian/rules b/debian/rules
index 5ef21d6..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,9 @@
 #!/usr/bin/make -f
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
-l10npkgs_firstversion_ok := 4:4.14.0-2
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
+# 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
-
-override_dh_auto_test:
-	# Disable dh_auto_test at build time
-	:
+	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_gencontrol: l10npkgs_firstversion_ok
-	dh_gencontrol
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/