[SCM] kactivities packaging branch, kubuntu_unstable, updated. 69e3511dfebb4a826559c1ff9d5b4e7269facdaf

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 55a0077c6a9640182a1a60a159c3cf4d30ee6458
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Oct 28 15:24:29 2014 +0100

    wrapit!
---
 debian/control             |  4 +++-
 debian/kactivities.install | 10 +++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 08589d7..25d4179 100644
--- a/debian/control
+++ b/debian/control
@@ -61,7 +61,9 @@ Description: debug symbols for kactivities
 Package: qml-module-org-kde-extensionplugin
 Architecture: any
 Multi-arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}, libkf5activities5 (>= ${source:Version})
+Depends: libkf5activities5 (>= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: libkf5activities5 (<< 5.1.0-0ubuntu1)
 Replaces: libkf5activities5 (<< 5.1.0-0ubuntu1)
 Description: provides integration of QML and KDE Frameworks - extensionplugin
diff --git a/debian/kactivities.install b/debian/kactivities.install
index 6a22e1a..ac0be25 100644
--- a/debian/kactivities.install
+++ b/debian/kactivities.install
@@ -1,21 +1,21 @@
 usr/bin/kactivitymanagerd
 usr/lib/*/qt5/plugins/kactivitymanagerd/kactivitymanagerd_plugin_activitytemplates.so
+usr/lib/*/qt5/plugins/kactivitymanagerd/kactivitymanagerd_plugin_globalshortcuts.so
 usr/lib/*/qt5/plugins/kactivitymanagerd/kactivitymanagerd_plugin_slc.so
 usr/lib/*/qt5/plugins/kactivitymanagerd/kactivitymanagerd_plugin_sqlite.so
-usr/lib/*/qt5/plugins/kactivitymanagerd_fileitem_linking_plugin.so
-usr/lib/*/qt5/plugins/kactivitymanagerd/kactivitymanagerd_plugin_globalshortcuts.so
 usr/lib/*/qt5/plugins/kactivitymanagerd/kactivitymanagerd_plugin_virtualdesktopswitch.so
+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/kservices5/kactivitymanagerd.desktop
+usr/share/kf5/kactivitymanagerd/workspace/settings/BlacklistApplicationView.qml
 usr/share/kservices5/activities.protocol
-usr/share/kservices5/kactivitymanagerd_fileitem_linking_plugin.desktop
 usr/share/kservices5/kactivitymanagerd-plugin-activitytemplates.desktop
 usr/share/kservices5/kactivitymanagerd-plugin-globalshortcuts.desktop
 usr/share/kservices5/kactivitymanagerd-plugin-slc.desktop
 usr/share/kservices5/kactivitymanagerd-plugin-sqlite.desktop
 usr/share/kservices5/kactivitymanagerd-plugin-virtualdesktopswitch.desktop
+usr/share/kservices5/kactivitymanagerd.desktop
+usr/share/kservices5/kactivitymanagerd_fileitem_linking_plugin.desktop
 usr/share/kservices5/kcm_activities.desktop
 usr/share/kservicetypes5/kactivitymanagerd-plugin.desktop
 usr/share/locale/*/LC_MESSAGES/kactivities5.mo
-usr/share/kf5/kactivitymanagerd/workspace/settings/BlacklistApplicationView.qml

-- 
kactivities packaging