[SCM] kdbusaddons packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g50bd3e0

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 479500708904974fc5ee5ae3bf7b506ff91f73cc
Merge: 7a21ad19812e8a607ccccb8ecc285702fb20d2ae 1444e05b6f755fe3acdd6ecc8c16629cff7327e3
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 11:12:14 2015 +0200

    Merge commit '1444e05b6f755fe3acdd6ecc8c16629cff7327e3'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index cf362c1,2579789..1874fc2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +kdbusaddons (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:24:45 +0200
 +
+ kdbusaddons (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:25:51 +0200
+ 
 +kdbusaddons (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 14 Mar 2015 22:27:09 +0100
 +
+ kdbusaddons (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:35:29 +0100
+ 
 +kdbusaddons (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +  * Update build dependencies.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 28 Feb 2015 00:06:30 +0100
 +
  kdbusaddons (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kdbusaddons packaging