[neon/kde/plasma-workspace/Neon/unstable] debian: wrap-and-sort, switch recommends to libpam-kwallet6, it was libpam-kwallet5 but got switched to the incomplete libpam-kwallet-common for some reason

Jonathan Esk-Riddell null at kde.org
Wed Dec 6 12:25:57 GMT 2023


Git commit 6253aed2f61cb93a36ef110dfe2bf67447e4ca3c by Jonathan Esk-Riddell.
Committed on 06/12/2023 at 13:25.
Pushed by jriddell into branch 'Neon/unstable'.

wrap-and-sort, switch recommends to libpam-kwallet6, it was libpam-kwallet5 but got switched to the incomplete libpam-kwallet-common for some reason

M  +16   -20   debian/control
M  +7    -7    debian/plasma-workspace.install

https://invent.kde.org/neon/kde/plasma-workspace/-/commit/6253aed2f61cb93a36ef110dfe2bf67447e4ca3c

diff --git a/debian/control b/debian/control
index e538164..e4d16cf 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Build-Depends: appmenu-gtk2-module,
                breeze-dev,
                cmake,
                debhelper-compat (= 13),
-               kf6-extra-cmake-modules,
                kf6-baloo-dev,
+               kf6-extra-cmake-modules,
                kf6-kcmutils-dev,
                kf6-kcolorscheme-dev,
                kf6-kconfig-dev,
@@ -26,25 +26,25 @@ Build-Depends: appmenu-gtk2-module,
                kf6-ki18n-dev,
                kf6-kidletime-dev,
                kf6-kio-dev,
-               kf6-kirigami2-dev,
                kf6-kirigami-addons-dev,
+               kf6-kirigami2-dev,
                kf6-kitemmodels-dev,
                kf6-knewstuff-dev,
+               kf6-knotifications-dev,
                kf6-knotifyconfig-dev,
                kf6-kpackage-dev,
                kf6-kparts-dev,
                kf6-kpeople-dev,
                kf6-kquickcharts-dev,
                kf6-krunner-dev,
-               kf6-ksvg-dev,
                kf6-kstatusnotifieritem-dev,
+               kf6-ksvg-dev,
                kf6-ktexteditor-dev,
                kf6-ktextwidgets-dev,
                kf6-kunitconversion-dev,
                kf6-kuserfeedback-dev,
                kf6-kwallet-dev,
                kf6-networkmanager-qt-dev,
-               kf6-knotifications-dev,
                kf6-plasma5support-dev,
                kf6-prison-dev,
                kf6-solid-dev,
@@ -60,8 +60,8 @@ Build-Depends: appmenu-gtk2-module,
                libgps-dev,
                libicu-dev,
                libkexiv2qt6-dev,
-               libkf6screen-dev,
                libkf5sysguard-dev,
+               libkf6screen-dev,
                libkpipewire-dev,
                liblayershellqtinterface-dev,
                libmpfr-dev,
@@ -115,7 +115,7 @@ Build-Depends: appmenu-gtk2-module,
                qt6-wayland-dev,
                qt6-wayland-dev-tools,
                wayland-protocols,
-               xcb-proto,
+               xcb-proto
 Standards-Version: 4.6.2
 Homepage: https://projects.kde.org/projects/kde/workspace/plasma-workspace
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/plasma/plasma-workspace.git
@@ -130,7 +130,6 @@ Depends: accountsservice,
          drkonqi,
          gdb-minimal | gdb,
          iso-codes,
-         libplasma6,
          kactivitymanagerd,
          kf6-frameworkintegration,
          kf6-kactivities,
@@ -141,27 +140,27 @@ Depends: accountsservice,
          kf6-kglobalaccel,
          kf6-kholidays,
          kf6-kio,
-         kf6-kirigami2,
          kf6-kirigami-addons,
+         kf6-kirigami2,
          kf6-knewstuff,
          kf6-knotifications,
-         kf6-kservice,
          kf6-kquickcharts,
+         kf6-kservice,
          kf6-kwindowsystem,
          kf6-prison,
          kf6-qqc2-desktop-style,
          kio-extras,
-#         kio-fuse,
          kwin-common,
          kwin-wayland,
          language-selector-common,
          layer-shell-qt,
          libplasma-dev
          milou,
+         libplasma6,
          plasma-integration,
          qml6-module-org-kde-ksysguard,
-         qml6-module-org-kde-userfeedback,
          qml6-module-org-kde-pipewire,
+         qml6-module-org-kde-userfeedback,
          qml6-module-qt-labs-folderlistmodel,
          qml6-module-qt5compat-graphicaleffects,
          qml6-module-qtquick-virtualkeyboard,
@@ -174,8 +173,7 @@ Depends: accountsservice,
          xdg-desktop-portal-kde,
          ${misc:Depends},
          ${shlibs:Depends}
-Provides: notification-daemon,
-          libcolorcorrect5,
+Provides: libcolorcorrect5,
           libkfontinst5,
           libkfontinstui5,
           libkmpris5,
@@ -183,8 +181,9 @@ Provides: notification-daemon,
           libplasma-geolocation-interface5,
           libtaskmanager6,
           libweather-ion7,
+          notification-daemon,
           plasma-workspace-dbg,
-          sddm-theme-breeze,
+          sddm-theme-breeze
 Replaces: libcolorcorrect5,
           libkfontinst5,
           libkfontinstui5,
@@ -194,11 +193,8 @@ Replaces: libcolorcorrect5,
           libtaskmanager6,
           libweather-ion7,
           plasma-workspace-dbg,
-          sddm-theme-breeze,
-Recommends: kde-cli-tools,
-#            kio-fuse,
-            libpam-kwallet-common,
-            plasma-workspace-wallpapers
+          sddm-theme-breeze
+Recommends: kde-cli-tools, libpam-kwallet6, plasma-workspace-wallpapers
 Description: Plasma Workspace for KF6
  Plasma Workspace for KF6. Workspaces provide
  support for KDE Plasma Widgets, integrated search,
@@ -309,4 +305,4 @@ Package: sddm-theme-breeze
 Architecture: all
 Depends: plasma-workspace, ${misc:Depends}
 Description: Dummy transitional
- Transitional dummy package.
\ No newline at end of file
+ Transitional dummy package.
diff --git a/debian/plasma-workspace.install b/debian/plasma-workspace.install
index b293cbe..e8818a8 100644
--- a/debian/plasma-workspace.install
+++ b/debian/plasma-workspace.install
@@ -1,13 +1,16 @@
 etc/xdg/
 usr/bin/
+usr/lib/*/kconf_update_bin/
 usr/lib/*/libcolorcorrect.so.5
 usr/lib/*/libcolorcorrect.so.5.*
+usr/lib/*/libexec/
 usr/lib/*/libkfontinst.so.5
 usr/lib/*/libkfontinst.so.5.*
 usr/lib/*/libkfontinstui.so.5
 usr/lib/*/libkfontinstui.so.5.*
 usr/lib/*/libkmpris.so.5
 usr/lib/*/libkmpris.so.5.*
+usr/lib/*/libkrdb.so
 usr/lib/*/libkworkspace6.so.5
 usr/lib/*/libkworkspace6.so.5.*
 usr/lib/*/libnotificationmanager.so.1
@@ -18,11 +21,8 @@ usr/lib/*/libtaskmanager.so.5.*
 usr/lib/*/libtaskmanager.so.6
 usr/lib/*/libweather_ion.so.7
 usr/lib/*/libweather_ion.so.7.*
-usr/lib/*/kconf_update_bin/
-usr/lib/*/libexec/
-usr/lib/*/libkrdb.so
-usr/lib/*/qt6/qml/
 usr/lib/*/qt6/plugins/
+usr/lib/*/qt6/qml/
 usr/lib/systemd/user/
 usr/share/applications/
 usr/share/config.kcfg/
@@ -33,8 +33,8 @@ usr/share/icons/
 usr/share/kconf_update/
 usr/share/kfontinst/icons/
 usr/share/kglobalaccel/org.kde.krunner.desktop
-usr/share/kio_desktop/
 usr/share/kio/servicemenus/
+usr/share/kio_desktop/
 usr/share/knotifications6/
 usr/share/knsrcfiles/
 usr/share/konqsidebartng/virtual_folders/services/fonts.desktop
@@ -51,6 +51,6 @@ usr/share/polkit-1/
 usr/share/qlogging-categories6/
 usr/share/sddm/themes/breeze/
 usr/share/solid/actions/
-usr/share/zsh/site-functions/_plasmashell
 usr/share/wayland-sessions/
-usr/share/xsessions/
\ No newline at end of file
+usr/share/xsessions/
+usr/share/zsh/site-functions/_plasmashell


More information about the Neon-commits mailing list