[SCM] kded packaging branch, master, updated. ad28343d1f6ad911643605a1a44079bc500e13ee

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 852c6663b828c1b45b84d4b16062bb4ac9b029c9
Merge: a4980f737e931e2034d63faa8ed183f441ce20de 03af1720538ea80bdde9cba550cba9eed0013f78
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 11:20:24 2015 +0200

    Merge commit '03af1720538ea80bdde9cba550cba9eed0013f78'
    
    Conflicts:
    	debian/control

 debian/changelog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --cc debian/changelog
index 8bfc385,ee0a011..cd130cc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,15 +1,33 @@@
 +kded (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:22:40 +0200
 +
+ kded (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:24:56 +0200
+ 
 +kded (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:39:12 +0100
 +
+ kded (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:32:08 +0100
+ 
 +kded (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:57 +0100
 +
  kded (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kded packaging