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

[Carlos De Maine]

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

port to kf6

M  +13   -16   debian/control
M  +4    -4    debian/khotkeys-data.install
M  +2    -2    debian/khotkeys-dev.install
M  +4    -4    debian/khotkeys.install
M  +5    -12   debian/rules

https://invent.kde.org/neon/kde/khotkeys/commit/e708514beb49f0e32cd39296f46940ccd7cc145a

diff --git a/debian/control b/debian/control
index 592c0c8..69d61c7 100644
--- a/debian/control
+++ b/debian/control
@@ -5,24 +5,21 @@ 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 (>= 11~),
-               extra-cmake-modules (>= 1.3.0~),
-               kinit-dev,
-               libkf5dbusaddons-dev (>= 5.2.0),
-               libkf5doctools-dev (>= 5.41.0),
-               libkf5globalaccel-dev (>= 5.2.0),
-               libkf5i18n-dev (>= 5.2.0),
-               libkf5itemmodels-dev (>= 5.41.0~),
-               libkf5kcmutils-dev (>= 5.2.0),
-               libkf5kdelibs4support-dev (>= 5.2.0),
-               libkf5kio-dev (>= 5.2.0),
-               libkf5plasma-dev (>= 5.2.0),
-               libkf5xmlgui-dev (>= 5.2.0),
-               libqt5x11extras5-dev (>= 5.11.0~),
+               kf6-extra-cmake-modules,
+               kf6-kcmutils-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-kglobalaccel-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-kitemmodels-dev,
+               kf6-kxmlgui-dev,
+               kf6-plasma-framework-dev,
                libx11-dev,
                libxtst-dev,
-               pkg-kde-tools (>= 0.15.18~),
+               pkg-kde-tools-neon,
                plasma-workspace-dev (>= 4:5.2.2),
-               qtbase5-dev (>= 5.4),
+               qt6-base-dev
 Standards-Version: 4.1.4
 Homepage: https://projects.kde.org/projects/kde/workspace/khotkeys
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/khotkeys
@@ -32,7 +29,7 @@ Package: khotkeys
 Architecture: any
 Depends: khotkeys-data (= ${source:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: configure input actions settings
  Configure input actions settings in Plasma.
  .
diff --git a/debian/khotkeys-data.install b/debian/khotkeys-data.install
index 5580908..09bb789 100644
--- a/debian/khotkeys-data.install
+++ b/debian/khotkeys-data.install
@@ -1,4 +1,4 @@
-usr/share/doc/HTML/*/kcontrol/khotkeys/
-usr/share/khotkeys/
-usr/share/kservices5/khotkeys.desktop
-usr/share/locale/*/*/khotkeys.mo
+usr/kf6/share/doc/HTML/*/kcontrol/khotkeys/
+usr/kf6/share/khotkeys/
+usr/kf6/share/kservices5/khotkeys.desktop
+usr/kf6/share/locale/*/*/khotkeys.mo
diff --git a/debian/khotkeys-dev.install b/debian/khotkeys-dev.install
index 25f55c6..847a5bd 100644
--- a/debian/khotkeys-dev.install
+++ b/debian/khotkeys-dev.install
@@ -1,2 +1,2 @@
-usr/lib/*/cmake/KHotKeysDBusInterface/KHotKeysDBusInterfaceConfig.cmake
-usr/share/dbus-1/interfaces/org.kde.khotkeys.xml
+usr/kf6/lib/*/cmake/KHotKeysDBusInterface/KHotKeysDBusInterfaceConfig.cmake
+usr/kf6/share/dbus-1/interfaces/org.kde.khotkeys.xml
diff --git a/debian/khotkeys.install b/debian/khotkeys.install
index e8df1ae..74621e9 100644
--- a/debian/khotkeys.install
+++ b/debian/khotkeys.install
@@ -1,4 +1,4 @@
-usr/lib/*/libkhotkeysprivate.so.5
-usr/lib/*/libkhotkeysprivate.so.5.*
-usr/lib/*/qt5/plugins/kcm_hotkeys.so
-usr/lib/*/qt5/plugins/kf5/kded/khotkeys.so
+usr/kf6/lib/*/libkhotkeysprivate.so.5
+usr/kf6/lib/*/libkhotkeysprivate.so.5.*
+usr/kf6/lib/*/qt6/plugins/kcm_hotkeys.so
+usr/kf6/lib/*/qt6/plugins/kf6/kded/khotkeys.so
diff --git a/debian/rules b/debian/rules
index 6e77c20..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-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_strip:
-	dh_strip --dbgsym-migration='khotkeys-dbg (<= 4:5.5.5-1~~)'
+	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)/