[SCM] kactivities packaging branch, master, updated. 3ce5c84d0ee7f7f78f13b11474923f0a5e41a270

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 0d7325f1e3b28992798f640d665127b80c2f7f4f
Merge: 9136b1ccf30378c77ca5982ae0c0738e8df5d405 58e96a5fba230c92616d264a2294b41386149372
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Apr 16 13:32:03 2015 +0200

    Merge commit '58e96a5fba230c92616d264a2294b41386149372'
    
    Conflicts:
    	debian/control
    	debian/kactivities.install

 debian/changelog           | 12 ++++++++++++
 debian/kactivities.install |  6 +-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 56a46cf,0c5ce4f..8eaea7f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,15 +1,33 @@@
 +kactivities-kf5 (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:25:24 +0200
 +
+ kactivities-kf5 (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:27:18 +0200
+ 
 +kactivities-kf5 (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:38:56 +0100
 +
+ kactivities-kf5 (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:37:08 +0100
+ 
 +kactivities-kf5 (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Mar 2015 22:57:50 +0100
 +
  kactivities-kf5 (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/kactivities.install
index c6358ae,b226e26..be44f6b
--- a/debian/kactivities.install
+++ b/debian/kactivities.install
@@@ -5,11 -10,12 +5,7 @@@ usr/lib/*/qt5/plugins/kcm_activities.s
  usr/lib/*/qt5/plugins/kio_activities.so
  usr/share/kf5/kactivitymanagerd/workspace/settings/BlacklistApplicationView.qml
  usr/share/kservices5/activities.protocol
--usr/share/kservices5/kactivitymanagerd-plugin-activitytemplates.desktop
 -usr/share/kservices5/kactivitymanagerd-plugin-eventspy.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.desktop
  usr/share/kservices5/kactivitymanagerd_fileitem_linking_plugin.desktop
  usr/share/kservices5/kcm_activities.desktop

-- 
kactivities packaging