[neon/kde/powerdevil/Neon/unstable] debian: install to /usr and kf6-kuserfeedback-dev

[Carlos De Maine]

Git commit 661d4f12c2864101e4e1ab38b2a0f718878e03a6 by Carlos De Maine.
Committed on 13/05/2023 at 07:57.
Pushed by carlosdem into branch 'Neon/unstable'.

install to /usr and kf6-kuserfeedback-dev

M  +1    -1    debian/control
M  +2    -2    debian/libpowerdevilcore2.install
M  +2    -2    debian/libpowerdevilui5.install
M  +4    -4    debian/powerdevil-data.install
M  +3    -3    debian/powerdevil-dev.install
M  +9    -9    debian/powerdevil.install
M  +1    -1    debian/powerdevil.postinst.in
M  +1    -1    debian/setcap.yaml

https://invent.kde.org/neon/kde/powerdevil/commit/661d4f12c2864101e4e1ab38b2a0f718878e03a6

diff --git a/debian/control b/debian/control
index 6a8f874..a5c424b 100644
--- a/debian/control
+++ b/debian/control
@@ -22,10 +22,10 @@ Build-Depends: cmake (>= 3.0~),
                kf6-kirigami2-dev,
                kf6-knotifications-dev,
                kf6-knotifyconfig-dev,
+               kf6-kuserfeedback6-dev,
                kf6-kwayland-dev,
                kf6-networkmanager-qt-dev,
                kf6-solid-dev,
-               kuserfeedback6-dev,
                libcap-dev,
                libddcutil-dev,
                libkf6screen-dev,
diff --git a/debian/libpowerdevilcore2.install b/debian/libpowerdevilcore2.install
index a58f39c..a728dd8 100644
--- a/debian/libpowerdevilcore2.install
+++ b/debian/libpowerdevilcore2.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libpowerdevilcore.so.2
-usr/kf6/lib/*/libpowerdevilcore.so.5.*
+usr/lib/*/libpowerdevilcore.so.2
+usr/lib/*/libpowerdevilcore.so.5.*
diff --git a/debian/libpowerdevilui5.install b/debian/libpowerdevilui5.install
index b040139..7e34469 100644
--- a/debian/libpowerdevilui5.install
+++ b/debian/libpowerdevilui5.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libpowerdevilui.so.5
-usr/kf6/lib/*/libpowerdevilui.so.5.*
+usr/lib/*/libpowerdevilui.so.5
+usr/lib/*/libpowerdevilui.so.5.*
diff --git a/debian/powerdevil-data.install b/debian/powerdevil-data.install
index c0e2b0e..e36646f 100644
--- a/debian/powerdevil-data.install
+++ b/debian/powerdevil-data.install
@@ -1,4 +1,4 @@
-usr/kf6/share/doc/HTML/*/kcontrol/powerdevil/
-usr/kf6/share/knotifications6
-usr/kf6/share/locale/*
-usr/kf6/share/qlogging-categories6/powerdevil.categories
+usr/share/doc/HTML/*/kcontrol/powerdevil/
+usr/share/knotifications6
+usr/share/locale/*
+usr/share/qlogging-categories6/powerdevil.categories
diff --git a/debian/powerdevil-dev.install b/debian/powerdevil-dev.install
index cfed812..9df7df8 100644
--- a/debian/powerdevil-dev.install
+++ b/debian/powerdevil-dev.install
@@ -1,3 +1,3 @@
-usr/kf6/lib/*/libpowerdevilconfigcommonprivate.so
-usr/kf6/lib/*/libpowerdevilcore.so
-usr/kf6/lib/*/libpowerdevilui.so
+usr/lib/*/libpowerdevilconfigcommonprivate.so
+usr/lib/*/libpowerdevilcore.so
+usr/lib/*/libpowerdevilui.so
diff --git a/debian/powerdevil.install b/debian/powerdevil.install
index a3e8dd9..01878fb 100644
--- a/debian/powerdevil.install
+++ b/debian/powerdevil.install
@@ -1,9 +1,9 @@
-/usr/kf6/etc/xdg/autostart/powerdevil.desktop
-usr/kf6/lib/*/libexec
-usr/kf6/lib/*/libpowerdevilconfigcommonprivate.so.*
-usr/kf6/lib/*/qt6
-usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm*
-usr/kf6/lib/systemd/user/
-usr/kf6/share/applications/kcm_*
-usr/kf6/share/dbus-1
-usr/kf6/share/polkit-1/
+etc/xdg/autostart/powerdevil.desktop
+usr/lib/*/libexec
+usr/lib/*/libpowerdevilconfigcommonprivate.so.*
+usr/lib/*/qt6
+usr/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm*
+usr/lib/systemd/user/
+usr/share/applications/kcm_*
+usr/share/dbus-1
+usr/share/polkit-1/
diff --git a/debian/powerdevil.postinst.in b/debian/powerdevil.postinst.in
index e301a38..04874b1 100644
--- a/debian/powerdevil.postinst.in
+++ b/debian/powerdevil.postinst.in
@@ -6,7 +6,7 @@ if [ "$1" = configure ]; then
     # Set the capabilities
     if command -v setcap > /dev/null && \
        setcap "CAP_SYS_RESOURCE=+ep" \
-            "/usr/kf6/lib/#DEB_HOST_MULTIARCH#/libexec/org_kde_powerdevil"; then
+            "/usr/lib/#DEB_HOST_MULTIARCH#/libexec/org_kde_powerdevil"; then
         echo "Sucessfully set capabilities for start_kdeinit"
     else
         echo "Failed to set capabilities for start_kdeinit" >&2
diff --git a/debian/setcap.yaml b/debian/setcap.yaml
index 37f8192..0d6789d 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_WAKE_ALARM=+ep", "*/usr/kf6/lib/*/libexec/org_kde_powerdevil"]
+- ["CAP_WAKE_ALARM=+ep", "*/usr/lib/*/libexec/org_kde_powerdevil"]