[SCM] plasma-workspace packaging branch, master, updated. debian/5.3.2-4-14-gf88000d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace.git;a=commitdiff;h=125630d

The following commit has been merged in the master branch:
commit 125630da7d042f041beb58bb0611b9ce13bc9df9
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Jul 15 10:10:44 2015 +0200

    install new files, moved here from kio-extras
---
 debian/control                  | 6 ++++--
 debian/plasma-workspace.install | 7 +++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index df4386f..2739ddf 100644
--- a/debian/control
+++ b/debian/control
@@ -138,9 +138,11 @@ Breaks: kde-window-manager (<= 4:5),
         kscreensaver-xsavers-webcollage,
         plasma-desktop (<= 4:5),
         plasma-desktopthemes-artwork,
-        ${kde-l10n:all}
+        ${kde-l10n:all},
+        kio-extras (<< 4:5.3.2+git20150710.0210),
+        kio-extras-data (<< 4:5.3.2+git20150710.0210)
 Conflicts: kde-workspace, kde-workspace-data, klipper
-Replaces: klipper, plasma-workspace-data, ${kde-l10n:all}
+Replaces: klipper, plasma-workspace-data, ${kde-l10n:all}, kio-extras (<< 4:5.3.2+git20150710.0210), kio-extras-data (<< 4:5.3.2+git20150710.0210)
 Recommends: libpam-kwallet5
 Description: Plasma Workspace for KF5
  Plasma Workspace for KF5. Workspaces provide
diff --git a/debian/plasma-workspace.install b/debian/plasma-workspace.install
index bf3006e..c32c4ee 100644
--- a/debian/plasma-workspace.install
+++ b/debian/plasma-workspace.install
@@ -29,6 +29,7 @@ usr/lib/*/libkdeinit5_ksmserver.so
 usr/lib/*/libkdeinit5_kuiserver5.so
 usr/lib/*/qt5/plugins/kcm_krunner_kill.so
 usr/lib/*/qt5/plugins/kded_appmenu.so
+usr/lib/*/qt5/plugins/kded_desktopnotifier.so
 usr/lib/*/qt5/plugins/kded_freespacenotifier.so
 usr/lib/*/qt5/plugins/kded_ksysguard.so
 usr/lib/*/qt5/plugins/kded_ktimezoned.so
@@ -36,6 +37,7 @@ usr/lib/*/qt5/plugins/kded_remotedirnotify.so
 usr/lib/*/qt5/plugins/kded_solidautoeject.so
 usr/lib/*/qt5/plugins/kded_soliduiserver.so
 usr/lib/*/qt5/plugins/kded_statusnotifierwatcher.so
+usr/lib/*/qt5/plugins/kf5/kio/desktop.so
 usr/lib/*/qt5/plugins/kio_applications.so
 usr/lib/*/qt5/plugins/kio_remote.so
 usr/lib/*/qt5/plugins/kpackage/
@@ -85,12 +87,17 @@ usr/share/doc/HTML/*/klipper/
 usr/share/drkonqi/
 usr/share/kconf_update/kscreenlocker.upd
 usr/share/kconf_update/ksreenlocker_5_3_separate_autologin.pl
+usr/share/kio_desktop/DesktopLinks/Home.desktop
+usr/share/kio_desktop/directory.desktop
+usr/share/kio_desktop/directory.trash
 usr/share/knotifications5/freespacenotifier.notifyrc
 usr/share/knotifications5/ksmserver.notifyrc
 usr/share/knotifications5/phonon.notifyrc
 usr/share/kservices5/applications.protocol
+usr/share/kservices5/desktop.protocol
 usr/share/kservices5/ion-noaa.desktop
 usr/share/kservices5/kded/appmenu.desktop
+usr/share/kservices5/kded/desktopnotifier.desktop
 usr/share/kservices5/kded/freespacenotifier.desktop
 usr/share/kservices5/kded/ksysguard.desktop
 usr/share/kservices5/kded/ktimezoned.desktop

-- 
plasma-workspace packaging