[SCM] kded packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-4-g7b42c81

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kded.git;a=commitdiff;h=7b42c81

The following commit has been merged in the kubuntu_unstable branch:
commit 7b42c814e2373cb25ecda748aa3157a96611d223
Merge: 8c716ffae78cef17ba6c1152e40987bd19287421 318b43b6278582668c3b01ced594df8896dc180f
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:07:39 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 88ae44a,842d1b2..c0cc74b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ kded (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 12:35:55 +0200
+ 
 +kded (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:33:29 +0200
 +
  kded (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kded packaging