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

Harald Sitter null at kde.org
Fri Mar 10 14:56:28 GMT 2023


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

port to kf6

M  +40   -45   debian/control
M  +23   -23   debian/kwin-common.install
M  +61   -61   debian/kwin-data.install
M  +10   -10   debian/kwin-dev.install
M  +2    -2    debian/kwin-wayland.install
M  +1    -1    debian/kwin-x11.install
M  +2    -2    debian/libkwineffects14.install
M  +2    -2    debian/libkwinglutils14.install
M  +5    -10   debian/rules

https://invent.kde.org/neon/kde/kwin/commit/ab7400673290ef22f9cd9b7917c3ed674b6b0a4f

diff --git a/debian/control b/debian/control
index a31fa01..b29c4ba 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,34 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: breeze-dev (>= 4:5.9.0~),
                cmake (>= 3.1~),
                debhelper (>= 11~),
-               extra-cmake-modules (>= 5.38~),
                hwdata,
-               kinit-dev (>= 5.42.0~),
-               kirigami2-dev,
+               kf6-extra-cmake-modules,
+               kf6-kactivities-dev,
+               kf6-kcmutils-dev,
+               kf6-kcompletion-dev,
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdeclarative-dev,
+               kf6-kdoctools-dev,
+               kf6-kglobalaccel-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kidletime-dev,
+               kf6-kio-dev,
+               kf6-kirigami2-dev,
+               kf6-knewstuff-dev,
+               kf6-knotifications-dev,
+               kf6-kpackage-dev,
+               kf6-krunner-dev,
+               kf6-kservice-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kwayland-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               kf6-plasma-framework-dev,
                kscreenlocker-dev,
                libcap-dev [linux-any],
                libdrm-dev (>= 2.4.62~),
@@ -22,37 +46,10 @@ Build-Depends: breeze-dev (>= 4:5.9.0~),
                libinput-dev (>= 1.9~),
                libkdecorations2-dev,
                libkdecorations2-dev (>= 4:5.13),
-               libkf5activities-dev (>= 5.42.0~),
-               libkf5completion-dev (>= 5.42.0~),
-               libkf5config-dev (>= 5.42.0~),
-               libkf5configwidgets-dev (>= 5.42.0~),
-               libkf5coreaddons-dev (>= 5.42.0~),
-               libkf5crash-dev (>= 5.42.0~),
-               libkf5declarative-dev (>= 5.42.0~),
-               libkf5doctools-dev (>= 5.42.0~),
-               libkf5globalaccel-dev (>= 5.42.0~),
-               libkf5i18n-dev (>= 5.42.0~),
-               libkf5iconthemes-dev (>= 5.42.0~),
-               libkf5idletime-dev (>= 5.42.0~),
-               libkf5kcmutils-dev (>= 5.42.0~),
-               libkf5kio-dev (>= 5.42.0~),
-               libkf5newstuff-dev (>= 5.42.0~),
-               libkf5notifications-dev (>= 5.42.0~),
-               libkf5package-dev (>= 5.42.0~),
-               libkf5plasma-dev (>= 5.42.0~),
-               libkf5runner-dev,
-               libkf5service-dev (>= 5.42.0~),
-               libkf5textwidgets-dev (>= 5.42.0~),
-               libkf5wayland-dev (>= 4:5.42.0~),
-               libkf5widgetsaddons-dev (>= 5.42.0~),
-               libkf5windowsystem-dev (>= 5.42.0~),
-               libkf5xmlgui-dev (>= 5.42.0~),
                libkwaylandserver-dev,
                liblcms2-dev,
                libpipewire-0.3-dev,
-               libqaccessibilityclient-qt5-dev,
-               libqt5sensors5-dev (>= 5.11.0~),
-               libqt5x11extras5-dev (>= 5.11.0~),
+               libqaccessibilityclient-qt6-dev,
                libsm-dev,
                libudev-dev [linux-any],
                libwayland-dev (>= 1.2),
@@ -81,14 +78,13 @@ Build-Depends: breeze-dev (>= 4:5.9.0~),
                libxkbcommon-dev (>= 0.7.0~),
                libxkbcommon-x11-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.15.18~),
+               pkg-kde-tools-neon,
                plasma-wayland-protocols,
-               qtbase5-dev (>= 5.11.0~),
-               qtbase5-private-dev (>= 5.7.0~),
-               qtdeclarative5-dev (>= 5.11.0~),
-               qtscript5-dev (>= 5.11.0~),
-               qttools5-dev (>= 5.11.0~),
-               qtwayland5-dev-tools,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-sensors-dev,
+               qt6-tools-dev,
+               qt6-wayland-dev-tools,
                wayland-protocols,
                xwayland
 Standards-Version: 4.1.4
@@ -99,8 +95,8 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kwin.git
 Package: kwin-common
 Architecture: any
 Depends: hwdata,
+         kf6-kglobalaccel,
          kwin-data (= ${source:Version}),
-         libkf5globalaccel-bin,
          libkwineffects14 (= ${binary:Version}),
          qml-module-org-kde-kcmutils,
          qml-module-org-kde-kitemmodels,
@@ -154,14 +150,13 @@ Description: KDE window manager data files
 Package: kwin-dev
 Section: libdevel
 Architecture: any
-Depends: kwin-common (= ${binary:Version}),
+Depends: kf6-kconfig-dev,
+         kf6-kcoreaddons-dev,
+         kf6-kwindowsystem-dev,
+         kwin-common (= ${binary:Version}),
          libegl1-mesa-dev (>= 1.2~),
          libepoxy-dev (>= 1.2),
-         libkf5config-dev (>= 5.42.0~),
-         libkf5coreaddons-dev (>= 5.42.0~),
-         libkf5windowsystem-dev (>= 5.42.0~),
-         libqt5x11extras5-dev (>= 5.11.0~),
-         qtbase5-dev (>= 5.11.0~),
+         qt6-base-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: kde-workspace-dev
diff --git a/debian/kwin-common.install b/debian/kwin-common.install
index 30d8a29..e802dae 100644
--- a/debian/kwin-common.install
+++ b/debian/kwin-common.install
@@ -1,23 +1,23 @@
-usr/lib/*/kconf_update_bin/kwin5_update_default_rules
-usr/lib/*/libexec/kwin*
-usr/lib/*/libkcmkwincommon.so.5*
-usr/lib/*/libkwin.so.5
-usr/lib/*/libkwin.so.5.*
-usr/lib/*/qt5/plugins/kpackage/packagestructure/
-usr/lib/*/qt5/plugins/org.kde.kdecoration2/
-usr/lib/*/qt5/plugins/kwin/
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings/kcm_kwin_effects.so
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings/kcm_kwin_scripts.so
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings/kcm_kwin_virtualdesktops.so
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings/kcm_kwindecoration.so
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings/kcm_kwinrules.so
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings/kcm_virtualkeyboard.so
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwinoptions.so
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwinscreenedges.so
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwintabbox.so
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwintouchscreen.so
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kwincompositing.so
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings/kcm_kwinxwayland.so
-usr/lib/*/qt5/qml/org/kde/kwin/
-usr/lib/systemd/user/
-usr/share/qlogging-categories5/org_kde_kwin.categories
+usr/kf6/lib/*/kconf_update_bin/kwin5_update_default_rules
+usr/kf6/lib/*/libexec/kwin*
+usr/kf6/lib/*/libkcmkwincommon.so.5*
+usr/kf6/lib/*/libkwin.so.5
+usr/kf6/lib/*/libkwin.so.5.*
+usr/kf6/lib/*/qt5/qml/org/kde/kwin/
+usr/kf6/lib/*/qt6/plugins/kpackage/packagestructure/
+usr/kf6/lib/*/qt6/plugins/kwin/
+usr/kf6/lib/*/qt6/plugins/org.kde.kdecoration2/
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_kwin_effects.so
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_kwin_scripts.so
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_kwin_virtualdesktops.so
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_kwindecoration.so
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_kwinrules.so
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_kwinxwayland.so
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_virtualkeyboard.so
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwinoptions.so
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwinscreenedges.so
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwintabbox.so
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwintouchscreen.so
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kwincompositing.so
+usr/kf6/lib/systemd/user/
+usr/kf6/share/qlogging-categories5/org_kde_kwin.categories
diff --git a/debian/kwin-data.install b/debian/kwin-data.install
index 10f5a8b..46a60d6 100644
--- a/debian/kwin-data.install
+++ b/debian/kwin-data.install
@@ -1,61 +1,61 @@
-usr/share/applications/kcm_kwin_effects.desktop
-usr/share/applications/kcm_kwin_scripts.desktop
-usr/share/applications/kcm_kwin_virtualdesktops.desktop
-usr/share/applications/kcm_kwinoptions.desktop
-usr/share/applications/kcm_kwinrules.desktop
-usr/share/applications/kcm_kwintabbox.desktop
-usr/share/applications/kcm_virtualkeyboard.desktop
-usr/share/applications/kwincompositing.desktop
-usr/share/applications/kcm_kwindecoration.desktop
-usr/share/applications/kcm_kwinxwayland.desktop
-usr/share/applications/org.kde.kwin_rules_dialog.desktop
-usr/share/config.kcfg/kwin.kcfg
-usr/share/config.kcfg/kwindecorationsettings.kcfg
-usr/share/config.kcfg/nightcolorsettings.kcfg
-usr/share/config.kcfg/virtualdesktopssettings.kcfg
-usr/share/doc/*/*/kcontrol/
-usr/share/icons/*/*/apps/kwin.*
-usr/share/kconf_update/kwin-5.16-auto-bordersize.sh
-usr/share/kconf_update/kwin-5.18-move-animspeed.py
-usr/share/kconf_update/kwin-5.21-desktop-grid-click-behavior.py
-usr/share/kconf_update/kwin-5.21-no-swap-encourage.py
-usr/share/kconf_update/kwin-5.23-disable-translucency-effect.sh
-usr/share/kconf_update/kwin-5.23-remove-cover-switch.py
-usr/share/kconf_update/kwin-5.23-remove-cubeslide.py
-usr/share/kconf_update/kwin-5.23-remove-flip-switch.py
-usr/share/kconf_update/kwin-5.23-remove-xrender-backend.py
-usr/share/kconf_update/kwin-5.25-effect-pluginid-config-group.py
-usr/share/kconf_update/kwin-5.27-replace-cascaded-zerocornered.sh
-usr/share/kconf_update/kwin.upd
-usr/share/kconf_update/kwinrules-5.19-placement.pl
-usr/share/kconf_update/kwinrules-5.23-virtual-desktop-ids.py
-usr/share/kconf_update/kwinrules.upd
-usr/share/knotifications5/kwin.notifyrc
-usr/share/kpackage/kcms/kcm_kwin_effects/
-usr/share/kpackage/kcms/kcm_kwin_scripts/
-usr/share/kpackage/kcms/kcm_kwin_virtualdesktops/
-usr/share/kpackage/kcms/kcm_kwindecoration/
-usr/share/kpackage/kcms/kcm_kwinrules/
-usr/share/kpackage/kcms/kcm_virtualkeyboard/
-usr/share/kpackage/kcms/kcm_kwinxwayland/
-usr/share/krunner/dbusplugins/kwin-runner-windows.desktop
-usr/share/kservicetypes5/kwin*.desktop
-usr/share/knsrcfiles/
-usr/share/kwin/
-usr/share/locale/*/*/kcm_kwin_effects.mo
-usr/share/locale/*/*/kcm_kwin_scripts.mo
-usr/share/locale/*/*/kcm_kwin_virtualdesktops.mo
-usr/share/locale/*/*/kcm_kwindecoration.mo
-usr/share/locale/*/*/kcm_kwinrules.mo
-usr/share/locale/*/*/kcm_kwintabbox.mo
-usr/share/locale/*/*/kcm_virtualkeyboard.mo
-usr/share/locale/*/*/kcmkwincommon.mo
-usr/share/locale/*/*/kcmkwincompositing.mo
-usr/share/locale/*/*/kcmkwinscreenedges.mo
-usr/share/locale/*/*/kcmkwm.mo
-usr/share/locale/*/*/kwin.mo
-usr/share/locale/*/*/kwin_clients.mo
-usr/share/locale/*/*/kwin_effects.mo
-usr/share/locale/*/*/kwin_scripting.mo
-usr/share/locale/*/*/kwin_scripts.mo
-usr/share/locale/*/*/kcm_kwinxwayland.mo
+usr/kf6/share/applications/kcm_kwin_effects.desktop
+usr/kf6/share/applications/kcm_kwin_scripts.desktop
+usr/kf6/share/applications/kcm_kwin_virtualdesktops.desktop
+usr/kf6/share/applications/kcm_kwindecoration.desktop
+usr/kf6/share/applications/kcm_kwinoptions.desktop
+usr/kf6/share/applications/kcm_kwinrules.desktop
+usr/kf6/share/applications/kcm_kwintabbox.desktop
+usr/kf6/share/applications/kcm_kwinxwayland.desktop
+usr/kf6/share/applications/kcm_virtualkeyboard.desktop
+usr/kf6/share/applications/kwincompositing.desktop
+usr/kf6/share/applications/org.kde.kwin_rules_dialog.desktop
+usr/kf6/share/config.kcfg/kwin.kcfg
+usr/kf6/share/config.kcfg/kwindecorationsettings.kcfg
+usr/kf6/share/config.kcfg/nightcolorsettings.kcfg
+usr/kf6/share/config.kcfg/virtualdesktopssettings.kcfg
+usr/kf6/share/doc/*/*/kcontrol/
+usr/kf6/share/icons/*/*/apps/kwin.*
+usr/kf6/share/kconf_update/kwin-5.16-auto-bordersize.sh
+usr/kf6/share/kconf_update/kwin-5.18-move-animspeed.py
+usr/kf6/share/kconf_update/kwin-5.21-desktop-grid-click-behavior.py
+usr/kf6/share/kconf_update/kwin-5.21-no-swap-encourage.py
+usr/kf6/share/kconf_update/kwin-5.23-disable-translucency-effect.sh
+usr/kf6/share/kconf_update/kwin-5.23-remove-cover-switch.py
+usr/kf6/share/kconf_update/kwin-5.23-remove-cubeslide.py
+usr/kf6/share/kconf_update/kwin-5.23-remove-flip-switch.py
+usr/kf6/share/kconf_update/kwin-5.23-remove-xrender-backend.py
+usr/kf6/share/kconf_update/kwin-5.25-effect-pluginid-config-group.py
+usr/kf6/share/kconf_update/kwin-5.27-replace-cascaded-zerocornered.sh
+usr/kf6/share/kconf_update/kwin.upd
+usr/kf6/share/kconf_update/kwinrules-5.19-placement.pl
+usr/kf6/share/kconf_update/kwinrules-5.23-virtual-desktop-ids.py
+usr/kf6/share/kconf_update/kwinrules.upd
+usr/kf6/share/knotifications5/kwin.notifyrc
+usr/kf6/share/knsrcfiles/
+usr/kf6/share/kpackage/kcms/kcm_kwin_effects/
+usr/kf6/share/kpackage/kcms/kcm_kwin_scripts/
+usr/kf6/share/kpackage/kcms/kcm_kwin_virtualdesktops/
+usr/kf6/share/kpackage/kcms/kcm_kwindecoration/
+usr/kf6/share/kpackage/kcms/kcm_kwinrules/
+usr/kf6/share/kpackage/kcms/kcm_kwinxwayland/
+usr/kf6/share/kpackage/kcms/kcm_virtualkeyboard/
+usr/kf6/share/krunner/dbusplugins/kwin-runner-windows.desktop
+usr/kf6/share/kservicetypes5/kwin*.desktop
+usr/kf6/share/kwin/
+usr/kf6/share/locale/*/*/kcm_kwin_effects.mo
+usr/kf6/share/locale/*/*/kcm_kwin_scripts.mo
+usr/kf6/share/locale/*/*/kcm_kwin_virtualdesktops.mo
+usr/kf6/share/locale/*/*/kcm_kwindecoration.mo
+usr/kf6/share/locale/*/*/kcm_kwinrules.mo
+usr/kf6/share/locale/*/*/kcm_kwintabbox.mo
+usr/kf6/share/locale/*/*/kcm_kwinxwayland.mo
+usr/kf6/share/locale/*/*/kcm_virtualkeyboard.mo
+usr/kf6/share/locale/*/*/kcmkwincommon.mo
+usr/kf6/share/locale/*/*/kcmkwincompositing.mo
+usr/kf6/share/locale/*/*/kcmkwinscreenedges.mo
+usr/kf6/share/locale/*/*/kcmkwm.mo
+usr/kf6/share/locale/*/*/kwin.mo
+usr/kf6/share/locale/*/*/kwin_clients.mo
+usr/kf6/share/locale/*/*/kwin_effects.mo
+usr/kf6/share/locale/*/*/kwin_scripting.mo
+usr/kf6/share/locale/*/*/kwin_scripts.mo
diff --git a/debian/kwin-dev.install b/debian/kwin-dev.install
index aef560a..f8ecd0a 100644
--- a/debian/kwin-dev.install
+++ b/debian/kwin-dev.install
@@ -1,10 +1,10 @@
-usr/include/kwin*.h
-usr/lib/*/cmake/KWinDBusInterface/
-usr/lib/*/cmake/KWinEffects/
-usr/lib/*/libkwineffects.so
-usr/lib/*/libkwingl*utils.so
-usr/share/dbus-1/interfaces/org.kde.KWin.Plugins.xml
-usr/share/dbus-1/interfaces/org.kde.KWin.TabletModeManager.xml
-usr/share/dbus-1/interfaces/org.kde.KWin.VirtualDesktopManager.xml
-usr/share/dbus-1/interfaces/org.kde.KWin.xml
-usr/share/dbus-1/interfaces/org.kde.kwin.*
+usr/kf6/include/kwin*.h
+usr/kf6/lib/*/cmake/KWinDBusInterface/
+usr/kf6/lib/*/cmake/KWinEffects/
+usr/kf6/lib/*/libkwineffects.so
+usr/kf6/lib/*/libkwingl*utils.so
+usr/kf6/share/dbus-1/interfaces/org.kde.KWin.Plugins.xml
+usr/kf6/share/dbus-1/interfaces/org.kde.KWin.TabletModeManager.xml
+usr/kf6/share/dbus-1/interfaces/org.kde.KWin.VirtualDesktopManager.xml
+usr/kf6/share/dbus-1/interfaces/org.kde.KWin.xml
+usr/kf6/share/dbus-1/interfaces/org.kde.kwin.*
diff --git a/debian/kwin-wayland.install b/debian/kwin-wayland.install
index fd488c0..182de6c 100644
--- a/debian/kwin-wayland.install
+++ b/debian/kwin-wayland.install
@@ -1,2 +1,2 @@
-usr/bin/kwin_wayland
-usr/bin/kwin_wayland_wrapper
+usr/kf6/bin/kwin_wayland
+usr/kf6/bin/kwin_wayland_wrapper
diff --git a/debian/kwin-x11.install b/debian/kwin-x11.install
index 17cda4e..284cf17 100644
--- a/debian/kwin-x11.install
+++ b/debian/kwin-x11.install
@@ -1 +1 @@
-usr/bin/kwin_x11
+usr/kf6/bin/kwin_x11
diff --git a/debian/libkwineffects14.install b/debian/libkwineffects14.install
index 53cb7d8..5446c2a 100644
--- a/debian/libkwineffects14.install
+++ b/debian/libkwineffects14.install
@@ -1,2 +1,2 @@
-usr/lib/*/libkwineffects.so.14
-usr/lib/*/libkwineffects.so.5.*
+usr/kf6/lib/*/libkwineffects.so.14
+usr/kf6/lib/*/libkwineffects.so.5.*
diff --git a/debian/libkwinglutils14.install b/debian/libkwinglutils14.install
index 7e6dc29..39b51d3 100644
--- a/debian/libkwinglutils14.install
+++ b/debian/libkwinglutils14.install
@@ -1,2 +1,2 @@
-usr/lib/*/libkwingl*utils.so.14
-usr/lib/*/libkwingl*utils.so.5.*
+usr/kf6/lib/*/libkwingl*utils.so.14
+usr/kf6/lib/*/libkwingl*utils.so.5.*
diff --git a/debian/rules b/debian/rules
index 2b63f4e..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +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
-
-override_dh_strip:
-	dh_strip --dbgsym-migration='kwin-dbg (<= 4:5.5.5-1~~)'
+	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_auto_test:
-	# Disable auto tests at build time
-	:
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/


More information about the Neon-commits mailing list