[neon/kde/kio/Neon/release] debian: bring back usr/lib/x86_64-linux-gnu/qt5/plugins/kcm_trash.so

[Jonathan Esk-Riddell]

Git commit c5d64c660879b404b226f13bddfbbcdcb6716d09 by Jonathan Esk-Riddell.
Committed on 22/01/2024 at 18:10.
Pushed by jriddell into branch 'Neon/release'.

bring back usr/lib/x86_64-linux-gnu/qt5/plugins/kcm_trash.so

M  +3    -6    debian/control
M  +4    -3    debian/kio.install

https://invent.kde.org/neon/kde/kio/-/commit/c5d64c660879b404b226f13bddfbbcdcb6716d09

diff --git a/debian/control b/debian/control
index 315979e..3ea1a79 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,6 @@ Build-Depends: cmake (>= 3.0~),
                libxml2-dev,
                libxslt1-dev,
                pkg-kde-tools (>= 0.15.15ubuntu1~),
-               switcheroo-control,
                qtbase5-dev (>= 5.8.0~),
                qtdeclarative5-dev,
                qtscript5-dev (>= 5.8.0~),
@@ -55,9 +54,7 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kio.git
 
 Package: kio
 Architecture: any
-Depends: kded5,
-         switcheroo-control,
-         ${misc:Depends}, ${shlibs:Depends}
+Depends: kded5, switcheroo-control, ${misc:Depends}, ${shlibs:Depends}
 Breaks: baloo-kf5 (<< 5.51),
         kdesignerplugin (<< 5.51),
         kinit (<< 5.51),
@@ -132,11 +129,11 @@ Breaks: kio-dev (<< 5.23.0-2~),
         kross-dev (<< 5.51),
         libkf5declarative-dev (<< 5.51),
         libkf5khtml-dev (<< 5.51),
+        libkf5kio-doc (<< 5.61.90-0),
         libkf5newstuff-dev (<< 5.51),
         libkf5notifyconfig-dev (<< 5.51),
         libkf5parts-dev (<< 5.51),
-        libkf5xmlrpcclient-dev (<< 5.51),
-        libkf5kio-doc (<< 5.61.90-0)
+        libkf5xmlrpcclient-dev (<< 5.51)
 Replaces: kio-dev (<< 5.23.0-2~), libkf5kio-doc (<< 5.61.90-0)
 Recommends: libkf5kio-doc (= ${source:Version})
 Description: resource and network access abstraction (development files)
diff --git a/debian/kio.install b/debian/kio.install
index dbbc2cf..3ef6647 100644
--- a/debian/kio.install
+++ b/debian/kio.install
@@ -1,4 +1,7 @@
 # Only used in KIO slaves
+#usr/share/doc/HTML/
+#usr/share/kconf_update/filepicker.upd
+#usr/share/kdevappwizard/templates/kioworker.tar.bz2
 usr/bin/kcookiejar5
 usr/bin/ktelnetservice5
 usr/bin/ktrash5
@@ -9,6 +12,7 @@ usr/lib/*/libexec/kf5/kioexec
 usr/lib/*/libexec/kf5/kioslave5
 usr/lib/*/libexec/kf5/kpac_dhcp_helper
 usr/lib/*/qt5/plugins/kcm_proxy.so
+usr/lib/*/qt5/plugins/kcm_trash.so
 usr/lib/*/qt5/plugins/kcm_webshortcuts.so
 usr/lib/*/qt5/plugins/kf5/kded/kcookiejar.so
 usr/lib/*/qt5/plugins/kf5/kded/proxyscout.so
@@ -28,11 +32,8 @@ usr/share/dbus-1/services/org.kde.kiod5.service
 usr/share/dbus-1/services/org.kde.kioexecd.service
 usr/share/dbus-1/services/org.kde.kpasswdserver.service
 usr/share/dbus-1/services/org.kde.kssld5.service
-#usr/share/kconf_update/filepicker.upd
-#usr/share/kdevappwizard/templates/kioworker.tar.bz2
 usr/share/kf5/kcookiejar/domain_info
 usr/share/knotifications5/proxyscout.notifyrc
 usr/share/kservices5/
 usr/share/kservicetypes5/
 usr/share/locale/*/*/kio5.mo
-#usr/share/doc/HTML/