[neon/kde/plasma-workspace/Neon/unstable] debian: install into /usr
Carlos De Maine
null at kde.org
Sun May 14 06:59:19 BST 2023
Git commit 2a96ab9aba40d9335230489806d0540ea489d153 by Carlos De Maine.
Committed on 14/05/2023 at 05:59.
Pushed by carlosdem into branch 'Neon/unstable'.
install into /usr
M +7 -5 debian/control
M +2 -2 debian/libcolorcorrect5.install
M +2 -2 debian/libkfontinst5.install
M +2 -2 debian/libkfontinstui5.install
M +2 -2 debian/libkworkspace5-5.install
M +3 -3 debian/libnotificationmanager1.install
M +2 -2 debian/libplasma-geolocation-interface5.install
M +2 -2 debian/libtaskmanager6.install
M +2 -2 debian/libweather-ion7.install
M +23 -23 debian/plasma-workspace-dev.install
M +2 -2 debian/plasma-workspace-wayland.install
M +79 -79 debian/plasma-workspace.install
M +2 -2 debian/plasma-workspace.postinst
M +1 -1 debian/plasma-workspace.prerm
M +1 -1 debian/sddm-theme-breeze.install
https://invent.kde.org/neon/kde/plasma-workspace/commit/2a96ab9aba40d9335230489806d0540ea489d153
diff --git a/debian/control b/debian/control
index 0fadb80..4768b0d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,12 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: breeze-dev,
cmake,
debhelper-compat (= 13),
- kdoctools-dev,
- kf6-baloo-dev,
+
+
kf6-extra-cmake-modules,
kf6-kactivities-dev,
kf6-kactivities-stats-dev,
+ kf6-baloo-dev,
kf6-kcmutils-dev,
kf6-kcolorscheme-dev,
kf6-kconfig-dev,
@@ -20,6 +21,7 @@ Build-Depends: breeze-dev,
kf6-kdeclarative-dev,
kf6-kded-dev,
kf6-kdesu-dev,
+ kf6-kdoctools-dev,
kf6-kfilemetadata-dev,
kf6-kglobalaccel-dev,
kf6-kholidays-dev,
@@ -37,6 +39,7 @@ Build-Depends: breeze-dev,
kf6-ktexteditor-dev,
kf6-ktextwidgets-dev,
kf6-kunitconversion-dev,
+ kf6-userfeedback-dev,
kf6-kwallet-dev,
kf6-kwayland-dev,
kf6-networkmanager-qt-dev,
@@ -45,11 +48,10 @@ Build-Depends: breeze-dev,
kf6-prison-dev,
kf6-solid-dev,
kf6-syntax-highlighting-dev,
- kscreenlocker-dev (>= 5.5.1~),
- kuserfeedback6-dev,
+ kscreenlocker-dev,
kwayland-dev (>= 4:5.5.1~),
kwin-dev (>= 4:5.5.1~),
- libappstreamqt-dev (>= 0.10.4~),
+ libappstreamqt-dev,
libboost-dev,
libdbusmenu-qt6-dev,
libdrm-dev,
diff --git a/debian/libcolorcorrect5.install b/debian/libcolorcorrect5.install
index 25c669e..c2b6f3e 100644
--- a/debian/libcolorcorrect5.install
+++ b/debian/libcolorcorrect5.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libcolorcorrect.so.5
-usr/kf6/lib/*/libcolorcorrect.so.5.*
+usr/lib/*/libcolorcorrect.so.5
+usr/lib/*/libcolorcorrect.so.5.*
diff --git a/debian/libkfontinst5.install b/debian/libkfontinst5.install
index 6f8c20c..419c2d3 100644
--- a/debian/libkfontinst5.install
+++ b/debian/libkfontinst5.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libkfontinst.so.5
-usr/kf6/lib/*/libkfontinst.so.5.*
+usr/lib/*/libkfontinst.so.5
+usr/lib/*/libkfontinst.so.5.*
diff --git a/debian/libkfontinstui5.install b/debian/libkfontinstui5.install
index 835894e..6fd2164 100644
--- a/debian/libkfontinstui5.install
+++ b/debian/libkfontinstui5.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libkfontinstui.so.5
-usr/kf6/lib/*/libkfontinstui.so.5.*
+usr/lib/*/libkfontinstui.so.5
+usr/lib/*/libkfontinstui.so.5.*
diff --git a/debian/libkworkspace5-5.install b/debian/libkworkspace5-5.install
index 4b7d2f5..8d50029 100644
--- a/debian/libkworkspace5-5.install
+++ b/debian/libkworkspace5-5.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libkworkspace5.so.5
-usr/kf6/lib/*/libkworkspace5.so.5.*
+usr/lib/*/libkworkspace5.so.5
+usr/lib/*/libkworkspace5.so.5.*
diff --git a/debian/libnotificationmanager1.install b/debian/libnotificationmanager1.install
index c1962b2..760f812 100644
--- a/debian/libnotificationmanager1.install
+++ b/debian/libnotificationmanager1.install
@@ -1,3 +1,3 @@
-usr/kf6/lib/*/libnotificationmanager.so.1
-usr/kf6/lib/*/libnotificationmanager.so.5*
-usr/kf6/share/qlogging-categories6/libnotificationmanager.categories
+usr/lib/*/libnotificationmanager.so.1
+usr/lib/*/libnotificationmanager.so.5*
+usr/share/qlogging-categories6/libnotificationmanager.categories
diff --git a/debian/libplasma-geolocation-interface5.install b/debian/libplasma-geolocation-interface5.install
index 7854123..e152858 100644
--- a/debian/libplasma-geolocation-interface5.install
+++ b/debian/libplasma-geolocation-interface5.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libplasma-geolocation-interface.so.5
-usr/kf6/lib/*/libplasma-geolocation-interface.so.5*
+usr/lib/*/libplasma-geolocation-interface.so.5
+usr/lib/*/libplasma-geolocation-interface.so.5*
diff --git a/debian/libtaskmanager6.install b/debian/libtaskmanager6.install
index 9becd02..7b272b7 100644
--- a/debian/libtaskmanager6.install
+++ b/debian/libtaskmanager6.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libtaskmanager.so.5.*
-usr/kf6/lib/*/libtaskmanager.so.6
+usr/lib/*/libtaskmanager.so.5.*
+usr/lib/*/libtaskmanager.so.6
diff --git a/debian/libweather-ion7.install b/debian/libweather-ion7.install
index ccad773..c3a8620 100644
--- a/debian/libweather-ion7.install
+++ b/debian/libweather-ion7.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/libweather_ion.so.7
-usr/kf6/lib/*/libweather_ion.so.7.*
+usr/lib/*/libweather_ion.so.7
+usr/lib/*/libweather_ion.so.7.*
diff --git a/debian/plasma-workspace-dev.install b/debian/plasma-workspace-dev.install
index a96b896..dbfc365 100644
--- a/debian/plasma-workspace-dev.install
+++ b/debian/plasma-workspace-dev.install
@@ -1,23 +1,23 @@
-usr/kf6/include/colorcorrect/
-usr/kf6/include/krdb/
-usr/kf6/include/kworkspace5/
-usr/kf6/include/notificationmanager/
-usr/kf6/include/plasma/geolocation/
-usr/kf6/include/plasma5support/weather/
-usr/kf6/include/taskmanager/
-usr/kf6/lib/*/cmake/KRunnerAppDBusInterface/KRunnerAppDBusInterfaceConfig.cmake
-usr/kf6/lib/*/cmake/KSMServerDBusInterface/KSMServerDBusInterfaceConfig.cmake
-usr/kf6/lib/*/cmake/LibColorCorrect/
-usr/kf6/lib/*/cmake/LibKWorkspace/
-usr/kf6/lib/*/cmake/LibNotificationManager/
-usr/kf6/lib/*/cmake/LibTaskManager/
-usr/kf6/lib/*/libcolorcorrect.so
-usr/kf6/lib/*/libkfontinst.so
-usr/kf6/lib/*/libkfontinstui.so
-usr/kf6/lib/*/libkworkspace5.so
-usr/kf6/lib/*/libnotificationmanager.so
-usr/kf6/lib/*/libplasma-geolocation-interface.so
-usr/kf6/lib/*/libtaskmanager.so
-usr/kf6/lib/*/libweather_ion.so
-usr/kf6/share/dbus-1/interfaces/
-usr/kf6/share/plasma5support/services/
+usr/include/colorcorrect/
+usr/include/krdb/
+usr/include/kworkspace5/
+usr/include/notificationmanager/
+usr/include/plasma/geolocation/
+usr/include/plasma5support/weather/
+usr/include/taskmanager/
+usr/lib/*/cmake/KRunnerAppDBusInterface/KRunnerAppDBusInterfaceConfig.cmake
+usr/lib/*/cmake/KSMServerDBusInterface/KSMServerDBusInterfaceConfig.cmake
+usr/lib/*/cmake/LibColorCorrect/
+usr/lib/*/cmake/LibKWorkspace/
+usr/lib/*/cmake/LibNotificationManager/
+usr/lib/*/cmake/LibTaskManager/
+usr/lib/*/libcolorcorrect.so
+usr/lib/*/libkfontinst.so
+usr/lib/*/libkfontinstui.so
+usr/lib/*/libkworkspace5.so
+usr/lib/*/libnotificationmanager.so
+usr/lib/*/libplasma-geolocation-interface.so
+usr/lib/*/libtaskmanager.so
+usr/lib/*/libweather_ion.so
+usr/share/dbus-1/interfaces/
+usr/share/plasma5support/services/
diff --git a/debian/plasma-workspace-wayland.install b/debian/plasma-workspace-wayland.install
index 01f176f..6e2b88b 100644
--- a/debian/plasma-workspace-wayland.install
+++ b/debian/plasma-workspace-wayland.install
@@ -1,2 +1,2 @@
-usr/kf6/bin/startplasma-wayland
-usr/kf6/share/wayland-sessions/plasmawayland.desktop
+usr/bin/startplasma-wayland
+usr/share/wayland-sessions/plasmawayland.desktop
diff --git a/debian/plasma-workspace.install b/debian/plasma-workspace.install
index e1e4ce5..45e0a39 100644
--- a/debian/plasma-workspace.install
+++ b/debian/plasma-workspace.install
@@ -1,79 +1,79 @@
-usr/kf6/etc/xdg/autostart/
-usr/kf6/etc/xdg/plasmanotifyrc
-usr/kf6/etc/xdg/taskmanagerrulesrc
-usr/kf6/bin/gmenudbusmenuproxy
-usr/kf6/bin/kcminit
-usr/kf6/bin/kcminit_startup
-usr/kf6/bin/kcolorschemeeditor
-usr/kf6/bin/kde-systemd-start-condition
-usr/kf6/bin/kfontinst
-usr/kf6/bin/kfontview
-usr/kf6/bin/krunner
-usr/kf6/bin/ksmserver
-usr/kf6/bin/ksplashqml
-usr/kf6/bin/lookandfeeltool
-usr/kf6/bin/plasma-apply-colorscheme
-usr/kf6/bin/plasma-apply-cursortheme
-usr/kf6/bin/plasma-apply-desktoptheme
-usr/kf6/bin/plasma-apply-lookandfeel
-usr/kf6/bin/plasma-apply-wallpaperimage
-usr/kf6/bin/plasma-interactiveconsole
-usr/kf6/bin/plasma-localegen-helper
-usr/kf6/bin/plasma-shutdown
-usr/kf6/bin/plasma_session
-usr/kf6/bin/plasma_waitforname
-usr/kf6/bin/plasmashell
-usr/kf6/bin/plasmawindowed
-usr/kf6/bin/startplasma-x11
-usr/kf6/bin/systemmonitor
-usr/kf6/bin/xembedsniproxy
-usr/kf6/lib/*/kconf_update_bin/
-usr/kf6/lib/*/libexec/baloorunner
-usr/kf6/lib/*/libexec/kauth/
-usr/kf6/lib/*/libexec/kfontprint
-usr/kf6/lib/*/libexec/ksmserver-logout-greeter
-usr/kf6/lib/*/libexec/plasma-changeicons
-usr/kf6/lib/*/libexec/plasma-dbus-run-session-if-needed
-usr/kf6/lib/*/libexec/plasma-sourceenv.sh
-usr/kf6/lib/*/libkrdb.so
-usr/kf6/lib/*/qt6/qml/
-usr/kf6/lib/*/qt6/plugins/
-usr/kf6/lib/systemd/user/
-usr/kf6/share/applications/
-usr/kf6/share/config.kcfg/
-usr/kf6/share/dbus-1/services/
-usr/kf6/share/dbus-1/system-services/org.kde.fontinst.service
-usr/kf6/share/dbus-1/system-services/org.kde.localegenhelper.service
-usr/kf6/share/dbus-1/system.d/org.kde.fontinst.conf
-usr/kf6/share/dbus-1/system.d/org.kde.localegenhelper.conf
-usr/kf6/share/desktop-directories/
-usr/kf6/share/doc/HTML/
-usr/kf6/share/icons/
-usr/kf6/share/kconf_update/
-usr/kf6/share/kfontinst/icons/
-usr/kf6/share/kglobalaccel/org.kde.krunner.desktop
-usr/kf6/share/kio_desktop/directory.desktop
-usr/kf6/share/kio_desktop/directory.trash
-usr/kf6/share/knotifications6/
-usr/kf6/share/knsrcfiles/
-usr/kf6/share/konqsidebartng/virtual_folders/services/fonts.desktop
-usr/kf6/share/krunner/dbusplugins/plasma-runner-baloosearch.desktop
-usr/kf6/share/kservices6/
-usr/kf6/share/kservicetypes6/
-usr/kf6/share/kstyle/
-usr/kf6/share/kxmlgui6/
-usr/kf6/share/locale/
-usr/kf6/share/metainfo/
-usr/kf6/share/plasma/
-usr/kf6/share/plasma/look-and-feel/
-usr/kf6/share/plasma/plasmoids/
-usr/kf6/share/polkit-1/actions/org.kde.fontinst.policy
-usr/kf6/share/polkit-1/actions/org.kde.localegenhelper.policy
-usr/kf6/share/qlogging-categories6/kcm_regionandlang.categories
-usr/kf6/share/qlogging-categories6/kcmusers.categories
-usr/kf6/share/qlogging-categories6/klipper.categories
-usr/kf6/share/qlogging-categories6/myproject.categories
-usr/kf6/share/qlogging-categories6/plasma-workspace.categories
-usr/kf6/share/solid/actions/
-usr/kf6/share/xsessions/plasma.desktop
-usr/kf6/share/zsh/site-functions/_plasmashell
+usr/etc/xdg/autostart/
+usr/etc/xdg/plasmanotifyrc
+usr/etc/xdg/taskmanagerrulesrc
+usr/bin/gmenudbusmenuproxy
+usr/bin/kcminit
+usr/bin/kcminit_startup
+usr/bin/kcolorschemeeditor
+usr/bin/kde-systemd-start-condition
+usr/bin/kfontinst
+usr/bin/kfontview
+usr/bin/krunner
+usr/bin/ksmserver
+usr/bin/ksplashqml
+usr/bin/lookandfeeltool
+usr/bin/plasma-apply-colorscheme
+usr/bin/plasma-apply-cursortheme
+usr/bin/plasma-apply-desktoptheme
+usr/bin/plasma-apply-lookandfeel
+usr/bin/plasma-apply-wallpaperimage
+usr/bin/plasma-interactiveconsole
+usr/bin/plasma-localegen-helper
+usr/bin/plasma-shutdown
+usr/bin/plasma_session
+usr/bin/plasma_waitforname
+usr/bin/plasmashell
+usr/bin/plasmawindowed
+usr/bin/startplasma-x11
+usr/bin/systemmonitor
+usr/bin/xembedsniproxy
+usr/lib/*/kconf_update_bin/
+usr/lib/*/libexec/baloorunner
+usr/lib/*/libexec/kauth/
+usr/lib/*/libexec/kfontprint
+usr/lib/*/libexec/ksmserver-logout-greeter
+usr/lib/*/libexec/plasma-changeicons
+usr/lib/*/libexec/plasma-dbus-run-session-if-needed
+usr/lib/*/libexec/plasma-sourceenv.sh
+usr/lib/*/libkrdb.so
+usr/lib/*/qt6/qml/
+usr/lib/*/qt6/plugins/
+usr/lib/systemd/user/
+usr/share/applications/
+usr/share/config.kcfg/
+usr/share/dbus-1/services/
+usr/share/dbus-1/system-services/org.kde.fontinst.service
+usr/share/dbus-1/system-services/org.kde.localegenhelper.service
+usr/share/dbus-1/system.d/org.kde.fontinst.conf
+usr/share/dbus-1/system.d/org.kde.localegenhelper.conf
+usr/share/desktop-directories/
+usr/share/doc/HTML/
+usr/share/icons/
+usr/share/kconf_update/
+usr/share/kfontinst/icons/
+usr/share/kglobalaccel/org.kde.krunner.desktop
+usr/share/kio_desktop/directory.desktop
+usr/share/kio_desktop/directory.trash
+usr/share/knotifications6/
+usr/share/knsrcfiles/
+usr/share/konqsidebartng/virtual_folders/services/fonts.desktop
+usr/share/krunner/dbusplugins/plasma-runner-baloosearch.desktop
+usr/share/kservices6/
+usr/share/kservicetypes6/
+usr/share/kstyle/
+usr/share/kxmlgui6/
+usr/share/locale/
+usr/share/metainfo/
+usr/share/plasma/
+usr/share/plasma/look-and-feel/
+usr/share/plasma/plasmoids/
+usr/share/polkit-1/actions/org.kde.fontinst.policy
+usr/share/polkit-1/actions/org.kde.localegenhelper.policy
+usr/share/qlogging-categories6/kcm_regionandlang.categories
+usr/share/qlogging-categories6/kcmusers.categories
+usr/share/qlogging-categories6/klipper.categories
+usr/share/qlogging-categories6/myproject.categories
+usr/share/qlogging-categories6/plasma-workspace.categories
+usr/share/solid/actions/
+usr/share/xsessions/plasma.desktop
+usr/share/zsh/site-functions/_plasmashell
diff --git a/debian/plasma-workspace.postinst b/debian/plasma-workspace.postinst
index 63fd186..0ca6cb5 100644
--- a/debian/plasma-workspace.postinst
+++ b/debian/plasma-workspace.postinst
@@ -21,10 +21,10 @@ set -e
case "$1" in
configure)
# remove the old
- update-alternatives --remove x-session-manager /usr/kf6/bin/startkde
+ update-alternatives --remove x-session-manager /usr/bin/startkde
# add the new
update-alternatives --install /usr/bin/x-session-manager \
- x-session-manager /usr/kf6/bin/startplasma-x11 40 #\
+ x-session-manager /usr/bin/startplasma-x11 40 #\
# startkde doesn't have manpage right now
#--slave /usr/share/man/man1/x-session-manager.1.gz \
#x-session-manager.1.gz "/usr/share/man/man1/startkde.1.gz"
diff --git a/debian/plasma-workspace.prerm b/debian/plasma-workspace.prerm
index 554b9fb..b9faff1 100644
--- a/debian/plasma-workspace.prerm
+++ b/debian/plasma-workspace.prerm
@@ -19,7 +19,7 @@ set -e
case "$1" in
remove)
- update-alternatives --remove x-session-manager /usr/kf6/bin/startkde
+ update-alternatives --remove x-session-manager /usr/bin/startkde
;;
upgrade|deconfigure)
diff --git a/debian/sddm-theme-breeze.install b/debian/sddm-theme-breeze.install
index 586d9db..acfa3a5 100644
--- a/debian/sddm-theme-breeze.install
+++ b/debian/sddm-theme-breeze.install
@@ -1 +1 @@
-usr/kf6/share/sddm/themes/breeze
+usr/share/sddm/themes/breeze
More information about the Neon-commits
mailing list