[neon/kde/plasma-desktop/Neon/unstable] debian: install into /usr

[Carlos De Maine]

Git commit 91da970a126d06fdee74cb00f6dcb69dc0d62c8c by Carlos De Maine.
Committed on 14/05/2023 at 08:21.
Pushed by carlosdem into branch 'Neon/unstable'.

install into /usr

M  +1    -1    debian/control
M  +12   -12   debian/plasma-desktop-data.install
M  +1    -1    debian/plasma-desktop-dev.install
M  +5    -5    debian/plasma-desktop.install

https://invent.kde.org/neon/kde/plasma-desktop/commit/91da970a126d06fdee74cb00f6dcb69dc0d62c8c

diff --git a/debian/control b/debian/control
index 7c6dac6..c43b66c 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Build-Depends: breeze-dev,
                kf6-knotifyconfig-dev,
                kf6-kpeople-dev,
                kf6-krunner-dev,
+               kf6-kuserfeedback-dev,
                kf6-kwallet-dev,
                kf6-kwidgetsaddons-dev,
                kf6-kwindowsystem-dev,
@@ -40,7 +41,6 @@ Build-Depends: breeze-dev,
                kf6-plasma5support-dev,
                kf6-qqc2-desktop-style-dev,
                kscreenlocker-dev,
-               kuserfeedback6-dev,
                kwin-dev (>= 4:5.4.0~),
                libappstreamqt-dev,
                libboost-dev,
diff --git a/debian/plasma-desktop-data.install b/debian/plasma-desktop-data.install
index 8bf10c3..8e7db67 100644
--- a/debian/plasma-desktop-data.install
+++ b/debian/plasma-desktop-data.install
@@ -1,12 +1,12 @@
-usr/kf6/etc/xdg/autostart/kaccess.desktop
-usr/kf6/share/config.kcfg/
-usr/kf6/share/dbus-1/system-services
-usr/kf6/share/doc/
-usr/kf6/share/icons/
-usr/kf6/share/k*
-usr/kf6/share/locale/
-usr/kf6/share/metainfo/
-usr/kf6/share/plasma
-usr/kf6/share/polkit-1/actions/
-usr/kf6/share/qlogging-categories6/
-usr/kf6/share/solid/
+etc/xdg/autostart/kaccess.desktop
+usr/share/config.kcfg/
+usr/share/dbus-1/system-services
+usr/share/doc/
+usr/share/icons/
+usr/share/k*
+usr/share/locale/
+usr/share/metainfo/
+usr/share/plasma
+usr/share/polkit-1/actions/
+usr/share/qlogging-categories6/
+usr/share/solid/
diff --git a/debian/plasma-desktop-dev.install b/debian/plasma-desktop-dev.install
index 883b132..1a3fce1 100644
--- a/debian/plasma-desktop-dev.install
+++ b/debian/plasma-desktop-dev.install
@@ -1 +1 @@
-usr/kf6/share/dbus-1/interfaces/org.kde.touchpad.xml
+usr/share/dbus-1/interfaces/org.kde.touchpad.xml
diff --git a/debian/plasma-desktop.install b/debian/plasma-desktop.install
index 51b7e29..1cab176 100644
--- a/debian/plasma-desktop.install
+++ b/debian/plasma-desktop.install
@@ -1,5 +1,5 @@
-usr/kf6/bin/
-usr/kf6/lib/*/libexec/
-usr/kf6/lib/*/qt6/
-usr/kf6/share/applications/
-usr/kf6/share/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
\ No newline at end of file
+usr/bin/
+usr//lib/*/libexec/
+usr/lib/*/qt6/
+usr/share/applications/
+usr/share/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
\ No newline at end of file