[SCM] kactivities packaging branch, kubuntu_vivid_backports, updated. ubuntu/5.14.0-0ubuntu1

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kactivities.git;a=commitdiff;h=1e6222c

The following commit has been merged in the kubuntu_vivid_backports branch:
commit 1e6222c8cc198e0b2a230c9c357aec5242b828f5
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Aug 12 06:48:14 2015 +0200

    install entire settings directory with all qml bits
---
 debian/kactivities.install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/kactivities.install b/debian/kactivities.install
index be44f6b..6175dea 100644
--- a/debian/kactivities.install
+++ b/debian/kactivities.install
@@ -3,7 +3,7 @@ usr/lib/*/qt5/plugins/kactivitymanagerd/
 usr/lib/*/qt5/plugins/kactivitymanagerd_fileitem_linking_plugin.so
 usr/lib/*/qt5/plugins/kcm_activities.so
 usr/lib/*/qt5/plugins/kio_activities.so
-usr/share/kf5/kactivitymanagerd/workspace/settings/BlacklistApplicationView.qml
+usr/share/kf5/kactivitymanagerd/workspace/settings/
 usr/share/kservices5/activities.protocol
 usr/share/kservices5/kactivitymanagerd-*.desktop
 usr/share/kservices5/kactivitymanagerd.desktop

-- 
kactivities packaging