[SCM] kguiaddons packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g99f15e0

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 977a36b5bb1682f33641de68d9d3da68de081d16
Merge: c4b9b766ca533d7bc9aec043effaabbbba979081 202211d1e60d4e55163e1ac34fb227d542a1638c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:17:39 2015 +0200

    Merge commit '202211d1e60d4e55163e1ac34fb227d542a1638c'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index bf86552,5daa268..f172fc9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,15 +1,35 @@@
 +kguiaddons (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:20:38 +0200
 +
+ kguiaddons (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:26:22 +0200
+ 
 +kguiaddons (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 14 Mar 2015 22:26:58 +0100
 +
+ kguiaddons (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:36:01 +0100
+ 
 +kguiaddons (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +  * Update build dependencies.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 02 Mar 2015 15:09:32 +0100
 +
  kguiaddons (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kguiaddons packaging