[neon/kde/libksysguard/Neon/unstable] debian: install into /usr
Carlos De Maine
null at kde.org
Sat May 13 23:48:57 BST 2023
Git commit fc6aca41af62f89e64c8407807cabcc9d432836d by Carlos De Maine.
Committed on 13/05/2023 at 22:48.
Pushed by carlosdem into branch 'Neon/unstable'.
install into /usr
M +4 -4 debian/libkf5sysguard-bin.install
M +7 -7 debian/libkf5sysguard-data.install
M +14 -14 debian/libkf5sysguard-dev.install
M +2 -2 debian/libksgrd9.install
M +2 -2 debian/libksignalplotter9.install
M +2 -2 debian/libksysguardformatter1.install
M +2 -2 debian/libksysguardsensorfaces1.install
M +2 -2 debian/libksysguardsensors1.install
M +3 -3 debian/libksysguardsystemstats1.install
M +2 -2 debian/liblsofui9.install
M +2 -2 debian/libprocesscore9.install
M +2 -2 debian/libprocessui9.install
M +2 -2 debian/qml6-module-org-kde-ksysguard.install
M +1 -1 debian/rules
M +1 -1 debian/setcap.yaml
https://invent.kde.org/neon/kde/libksysguard/commit/fc6aca41af62f89e64c8407807cabcc9d432836d
diff --git a/debian/libkf5sysguard-bin.install b/debian/libkf5sysguard-bin.install
index 8d970f8..cf1b408 100644
--- a/debian/libkf5sysguard-bin.install
+++ b/debian/libkf5sysguard-bin.install
@@ -1,4 +1,4 @@
-usr/kf6/lib/*/libexec/ksysguard/ksgrd_network_helper
-usr/kf6/lib/*/qt6/plugins/ksysguard/process/ksysguard_plugin_network.so
-usr/kf6/lib/*/qt6/plugins/ksysguard/process/ksysguard_plugin_nvidia.so
-usr/kf6/lib/*/libexec/kauth/ksysguardprocesslist_helper
+usr/lib/*/libexec/ksysguard/ksgrd_network_helper
+usr/lib/*/qt6/plugins/ksysguard/process/ksysguard_plugin_network.so
+usr/lib/*/qt6/plugins/ksysguard/process/ksysguard_plugin_nvidia.so
+usr/lib/*/libexec/kauth/ksysguardprocesslist_helper
diff --git a/debian/libkf5sysguard-data.install b/debian/libkf5sysguard-data.install
index 4bbeac8..f9707e6 100644
--- a/debian/libkf5sysguard-data.install
+++ b/debian/libkf5sysguard-data.install
@@ -1,7 +1,7 @@
-usr/kf6/share/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service
-usr/kf6/share/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
-usr/kf6/share/knsrcfiles/
-usr/kf6/share/ksysguard/
-usr/kf6/share/locale/
-usr/kf6/share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy
-usr/kf6/share/qlogging-categories6/libksysguard.categories
+usr/share/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service
+usr/share/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
+usr/share/knsrcfiles/
+usr/share/ksysguard/
+usr/share/locale/
+usr/share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy
+usr/share/qlogging-categories6/libksysguard.categories
diff --git a/debian/libkf5sysguard-dev.install b/debian/libkf5sysguard-dev.install
index 75f7bd7..1766795 100644
--- a/debian/libkf5sysguard-dev.install
+++ b/debian/libkf5sysguard-dev.install
@@ -1,14 +1,14 @@
-usr/kf6/include/ksysguard/
-usr/kf6/lib/*/cmake/KSysGuard/
-usr/kf6/lib/*/libKSysGuardFormatter.so
-usr/kf6/lib/*/libKSysGuardSensorFaces.so
-usr/kf6/lib/*/libKSysGuardSensors.so
-usr/kf6/lib/*/libKSysGuardSystemStats.so
-usr/kf6/lib/*/libksgrd.so
-usr/kf6/lib/*/libksignalplotter.so
-usr/kf6/lib/*/liblsofui.so
-usr/kf6/lib/*/libprocesscore.so
-usr/kf6/lib/*/libprocessui.so
-usr/kf6/lib/*/qt6/plugins/designer/ksignalplotter5widgets.so
-usr/kf6/lib/*/qt6/plugins/designer/ksysguard5widgets.so
-usr/kf6/lib/*/qt6/plugins/designer/ksysguardlsof5widgets.so
+usr/include/ksysguard/
+usr/lib/*/cmake/KSysGuard/
+usr/lib/*/libKSysGuardFormatter.so
+usr/lib/*/libKSysGuardSensorFaces.so
+usr/lib/*/libKSysGuardSensors.so
+usr/lib/*/libKSysGuardSystemStats.so
+usr/lib/*/libksgrd.so
+usr/lib/*/libksignalplotter.so
+usr/lib/*/liblsofui.so
+usr/lib/*/libprocesscore.so
+usr/lib/*/libprocessui.so
+usr/lib/*/qt6/plugins/designer/ksignalplotter5widgets.so
+usr/lib/*/qt6/plugins/designer/ksysguard5widgets.so
+usr/lib/*/qt6/plugins/designer/ksysguardlsof5widgets.so
diff --git a/debian/libksgrd9.install b/debian/libksgrd9.install
index 4bf2781..aa87b47 100644
--- a/debian/libksgrd9.install
+++ b/debian/libksgrd9.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libksgrd.so.5.*
-usr/kf6/lib/*/libksgrd.so.9
+usr/lib/*/libksgrd.so.5.*
+usr/lib/*/libksgrd.so.9
diff --git a/debian/libksignalplotter9.install b/debian/libksignalplotter9.install
index db116fe..0139f00 100644
--- a/debian/libksignalplotter9.install
+++ b/debian/libksignalplotter9.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libksignalplotter.so.5.*
-usr/kf6/lib/*/libksignalplotter.so.9
+usr/lib/*/libksignalplotter.so.5.*
+usr/lib/*/libksignalplotter.so.9
diff --git a/debian/libksysguardformatter1.install b/debian/libksysguardformatter1.install
index b46beb9..b601331 100644
--- a/debian/libksysguardformatter1.install
+++ b/debian/libksysguardformatter1.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libKSysGuardFormatter.so.1
-usr/kf6/lib/*/libKSysGuardFormatter.so.5.*
+usr/lib/*/libKSysGuardFormatter.so.1
+usr/lib/*/libKSysGuardFormatter.so.5.*
diff --git a/debian/libksysguardsensorfaces1.install b/debian/libksysguardsensorfaces1.install
index 4bafa0c..e533bd2 100644
--- a/debian/libksysguardsensorfaces1.install
+++ b/debian/libksysguardsensorfaces1.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libKSysGuardSensorFaces.so.1
-usr/kf6/lib/*/libKSysGuardSensorFaces.so.5.*
+usr/lib/*/libKSysGuardSensorFaces.so.1
+usr/lib/*/libKSysGuardSensorFaces.so.5.*
diff --git a/debian/libksysguardsensors1.install b/debian/libksysguardsensors1.install
index 0021ada..a6e51e6 100644
--- a/debian/libksysguardsensors1.install
+++ b/debian/libksysguardsensors1.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libKSysGuardSensors.so.1
-usr/kf6/lib/*/libKSysGuardSensors.so.5*
+usr/lib/*/libKSysGuardSensors.so.1
+usr/lib/*/libKSysGuardSensors.so.5*
diff --git a/debian/libksysguardsystemstats1.install b/debian/libksysguardsystemstats1.install
index 08c3969..a4e6a09 100644
--- a/debian/libksysguardsystemstats1.install
+++ b/debian/libksysguardsystemstats1.install
@@ -1,3 +1,3 @@
-usr/kf6/lib/*/libKSysGuardSystemStats.so.1
-usr/kf6/lib/*/libKSysGuardSystemStats.so.5*
-usr/kf6/share/dbus-1/interfaces/org.kde.ksystemstats.xml
+usr/lib/*/libKSysGuardSystemStats.so.1
+usr/lib/*/libKSysGuardSystemStats.so.5*
+usr/share/dbus-1/interfaces/org.kde.ksystemstats.xml
diff --git a/debian/liblsofui9.install b/debian/liblsofui9.install
index 688e1e8..928a3eb 100644
--- a/debian/liblsofui9.install
+++ b/debian/liblsofui9.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/liblsofui.so.5.*
-usr/kf6/lib/*/liblsofui.so.9
+usr/lib/*/liblsofui.so.5.*
+usr/lib/*/liblsofui.so.9
diff --git a/debian/libprocesscore9.install b/debian/libprocesscore9.install
index 9437455..e61b7b2 100644
--- a/debian/libprocesscore9.install
+++ b/debian/libprocesscore9.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libprocesscore.so.5.*
-usr/kf6/lib/*/libprocesscore.so.9
+usr/lib/*/libprocesscore.so.5.*
+usr/lib/*/libprocesscore.so.9
diff --git a/debian/libprocessui9.install b/debian/libprocessui9.install
index e272302..b1c7cb7 100644
--- a/debian/libprocessui9.install
+++ b/debian/libprocessui9.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libprocessui.so.5.*
-usr/kf6/lib/*/libprocessui.so.9
+usr/lib/*/libprocessui.so.5.*
+usr/lib/*/libprocessui.so.9
diff --git a/debian/qml6-module-org-kde-ksysguard.install b/debian/qml6-module-org-kde-ksysguard.install
index ebfc1bd..402a9b8 100644
--- a/debian/qml6-module-org-kde-ksysguard.install
+++ b/debian/qml6-module-org-kde-ksysguard.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/qt6/plugins/kf6/packagestructure/ksysguard_sensorface.so
-usr/kf6/lib/*/qt6/qml/org/kde/ksysguard/
+usr/lib/*/qt6/plugins/kf6/packagestructure/ksysguard_sensorface.so
+usr/lib/*/qt6/qml/org/kde/ksysguard/
diff --git a/debian/rules b/debian/rules
index 2cbe582..43590e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
dh $@ --with kf6 --buildsystem kf6
override_dh_shlibdeps:
- dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
+ dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/lib/$(DEB_HOST_MULTIARCH)/
override_dh_installdeb:
sed 's/#DEB_HOST_MULTIARCH#/$(DEB_HOST_MULTIARCH)/' \
diff --git a/debian/setcap.yaml b/debian/setcap.yaml
index f2a0216..4ef1805 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_NET_RAW=+ep", "*/usr/kf6/lib/*/libexec/ksysguard/ksgrd_network_helper"]
+- ["CAP_NET_RAW=+ep", "*/usr/lib/*/libexec/ksysguard/ksgrd_network_helper"]
More information about the Neon-commits
mailing list