[neon/kde/kwin/Neon/unstable] debian: install into /usr
Carlos De Maine
null at kde.org
Sun May 14 05:59:31 BST 2023
Git commit 779c1e1590cf47c50306390d64d099a1cd7eadbd by Carlos De Maine.
Committed on 14/05/2023 at 04:59.
Pushed by carlosdem into branch 'Neon/unstable'.
install into /usr
M +23 -23 debian/kwin-common.install
M +28 -28 debian/kwin-data.install
M +11 -11 debian/kwin-dev.install
M +2 -2 debian/kwin-wayland.install
M +1 -1 debian/kwin-x11.install
M +1 -1 debian/kwin-x11.links
M +1 -1 debian/kwin-x11.postinst
M +1 -1 debian/kwin-x11.prerm
M +2 -2 debian/libkwineffects14.install
M +2 -2 debian/libkwinglutils14.install
M +1 -1 debian/setcap.yaml
https://invent.kde.org/neon/kde/kwin/commit/779c1e1590cf47c50306390d64d099a1cd7eadbd
diff --git a/debian/kwin-common.install b/debian/kwin-common.install
index 53677ec..369470f 100644
--- a/debian/kwin-common.install
+++ b/debian/kwin-common.install
@@ -1,23 +1,23 @@
-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/*/qt6/qml/org/kde/kwin/
-usr/kf6/lib/*/qt6/plugins/kf6/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-categories6/org_kde_kwin.categories
+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/*/qt6/qml/org/kde/kwin/
+usr/lib/*/qt6/plugins/kf6/packagestructure/
+usr/lib/*/qt6/plugins/kwin/
+usr/lib/*/qt6/plugins/org.kde.kdecoration2/
+usr/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_kwin_effects.so
+usr/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_kwin_scripts.so
+usr/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_kwin_virtualdesktops.so
+usr/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_kwindecoration.so
+usr/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_kwinrules.so
+usr/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_kwinxwayland.so
+usr/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_virtualkeyboard.so
+usr/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwinoptions.so
+usr/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwinscreenedges.so
+usr/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwintabbox.so
+usr/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kwintouchscreen.so
+usr/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kwincompositing.so
+usr/lib/systemd/user/
+usr/share/qlogging-categories6/org_kde_kwin.categories
diff --git a/debian/kwin-data.install b/debian/kwin-data.install
index b7b8428..f682e3d 100644
--- a/debian/kwin-data.install
+++ b/debian/kwin-data.install
@@ -1,28 +1,28 @@
-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/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/knotifications6/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/kwin/
-usr/kf6/share/locale/*/*/*.mo
\ No newline at end of file
+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_kwindecoration.desktop
+usr/share/applications/kcm_kwinoptions.desktop
+usr/share/applications/kcm_kwinrules.desktop
+usr/share/applications/kcm_kwintabbox.desktop
+usr/share/applications/kcm_kwinxwayland.desktop
+usr/share/applications/kcm_virtualkeyboard.desktop
+usr/share/applications/kwincompositing.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/knotifications6/kwin.notifyrc
+usr/share/knsrcfiles/
+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_kwinxwayland/
+usr/share/kpackage/kcms/kcm_virtualkeyboard/
+usr/share/krunner/dbusplugins/kwin-runner-windows.desktop
+usr/share/kwin/
+usr/share/locale/*/*/*.mo
\ No newline at end of file
diff --git a/debian/kwin-dev.install b/debian/kwin-dev.install
index e84e103..9f0e60d 100644
--- a/debian/kwin-dev.install
+++ b/debian/kwin-dev.install
@@ -1,11 +1,11 @@
-usr/kf6/include/kwin/kwin_export.h
-usr/kf6/include/kwin/libkwineffects/
-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.*
+usr/include/kwin/kwin_export.h
+usr/include/kwin/libkwineffects/
+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.*
diff --git a/debian/kwin-wayland.install b/debian/kwin-wayland.install
index 182de6c..fd488c0 100644
--- a/debian/kwin-wayland.install
+++ b/debian/kwin-wayland.install
@@ -1,2 +1,2 @@
-usr/kf6/bin/kwin_wayland
-usr/kf6/bin/kwin_wayland_wrapper
+usr/bin/kwin_wayland
+usr/bin/kwin_wayland_wrapper
diff --git a/debian/kwin-x11.install b/debian/kwin-x11.install
index 284cf17..17cda4e 100644
--- a/debian/kwin-x11.install
+++ b/debian/kwin-x11.install
@@ -1 +1 @@
-usr/kf6/bin/kwin_x11
+usr/bin/kwin_x11
diff --git a/debian/kwin-x11.links b/debian/kwin-x11.links
index fe37ec7..b258253 100644
--- a/debian/kwin-x11.links
+++ b/debian/kwin-x11.links
@@ -1 +1 @@
-usr/kf6/bin/kwin_x11 usr/kf6/bin/kwin
+usr/bin/kwin_x11 usr/bin/kwin
diff --git a/debian/kwin-x11.postinst b/debian/kwin-x11.postinst
index da00948..ab238a1 100644
--- a/debian/kwin-x11.postinst
+++ b/debian/kwin-x11.postinst
@@ -20,7 +20,7 @@ set -e
case "$1" in
configure)
update-alternatives --remove x-window-manager /usr/kf6/bin/kwin
- update-alternatives --install /usr/kf6/bin/x-window-manager x-window-manager /usr/kf6/bin/kwin_x11 50
+ update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/kwin_x11 50
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/kwin-x11.prerm b/debian/kwin-x11.prerm
index a672105..63a4042 100644
--- a/debian/kwin-x11.prerm
+++ b/debian/kwin-x11.prerm
@@ -19,7 +19,7 @@ set -e
case "$1" in
remove)
- update-alternatives --remove x-window-manager /usr/kf6/bin/kwin_x11
+ update-alternatives --remove x-window-manager /usr/bin/kwin_x11
;;
upgrade|deconfigure)
diff --git a/debian/libkwineffects14.install b/debian/libkwineffects14.install
index 5446c2a..53cb7d8 100644
--- a/debian/libkwineffects14.install
+++ b/debian/libkwineffects14.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libkwineffects.so.14
-usr/kf6/lib/*/libkwineffects.so.5.*
+usr/lib/*/libkwineffects.so.14
+usr/lib/*/libkwineffects.so.5.*
diff --git a/debian/libkwinglutils14.install b/debian/libkwinglutils14.install
index 39b51d3..7e6dc29 100644
--- a/debian/libkwinglutils14.install
+++ b/debian/libkwinglutils14.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libkwingl*utils.so.14
-usr/kf6/lib/*/libkwingl*utils.so.5.*
+usr/lib/*/libkwingl*utils.so.14
+usr/lib/*/libkwingl*utils.so.5.*
diff --git a/debian/setcap.yaml b/debian/setcap.yaml
index 939c03f..56c92cd 100644
--- a/debian/setcap.yaml
+++ b/debian/setcap.yaml
@@ -2,4 +2,4 @@
# Being whitelisted means they will pass the build without problems.
# A whitelisted call needs to have a corresponding setcap/setuid call in
# postinst so it actually gets applied.
-- ["CAP_SYS_NICE=+ep", "*/usr/kf6/bin/kwin_wayland"]
+- ["CAP_SYS_NICE=+ep", "*/usr/bin/kwin_wayland"]
More information about the Neon-commits
mailing list