[neon/kde/kwin/Neon/unstable] debian: merge

[Jonathan Esk-Riddell]

Git commit 89f588804360bd541c9188969be3c896f9da1e70 by Jonathan Esk-Riddell.
Committed on 11/05/2022 at 15:44.
Pushed by jriddell into branch 'Neon/unstable'.

merge

M  +6    -6    debian/kwin-common.install
M  +1    -1    debian/kwin-data.install

https://invent.kde.org/neon/kde/kwin/commit/89f588804360bd541c9188969be3c896f9da1e70

diff --git a/debian/kwin-common.install b/debian/kwin-common.install
index e663009..a66941f 100644
--- a/debian/kwin-common.install
+++ b/debian/kwin-common.install
@@ -3,20 +3,20 @@ 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/kwin/
+usr/lib/*/qt5/plugins/org.kde.kdecoration2/kwin5_aurorae.so
 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/kwincompositing.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_kwintouchscreen.so
 usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwintabbox.so
-usr/lib/*/qt5/plugins/kpackage/packagestructure/
-usr/lib/*/qt5/plugins/kwin/
-usr/lib/*/qt5/plugins/org.kde.kdecoration2/kwin5_aurorae.so
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings/kcm_kwin_scripts.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/qml/org/kde/kwin.2/
 usr/lib/*/qt5/qml/org/kde/kwin/
 usr/lib/systemd/user/
diff --git a/debian/kwin-data.install b/debian/kwin-data.install
index b3782fa..b72acd0 100644
--- a/debian/kwin-data.install
+++ b/debian/kwin-data.install
@@ -1,4 +1,3 @@
-usr/share/applications/kwinscripts.desktop
 usr/share/applications/kcm_kwin_effects.desktop
 usr/share/applications/kcm_kwin_virtualdesktops.desktop
 usr/share/applications/kcm_kwinrules.desktop
@@ -6,6 +5,7 @@ usr/share/applications/kcm_virtualkeyboard.desktop
 usr/share/applications/kwincompositing.desktop
 usr/share/applications/kwinoptions.desktop
 usr/share/applications/kwinscreenedges.desktop
+usr/share/applications/kwinscripts.desktop
 usr/share/applications/kwintouchscreen.desktop
 usr/share/config.kcfg/kwin.kcfg
 usr/share/config.kcfg/kwin_colorcorrect.kcfg