[SCM] kactivities packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-g74f4b55

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 74f4b55f0b08a358529f545af298bf714a8a62dd
Merge: c6f217941b173c20bdca0aab5ee42503d620e021 ad983ef8a9315c687f4973fa4c2739add4947c24
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:09:00 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog |  7 +++++++
 debian/control   | 24 ++++++++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --cc debian/changelog
index 8ba334e,455b8d4..27ccd1d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
+ kactivities-kf5 (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 13:46:38 +0200
++
 +kactivities-kf5 (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:42:05 +0200
  
  kactivities-kf5 (5.9.0-1) experimental; urgency=medium
  

-- 
kactivities packaging