[SCM] kcmutils packaging branch, master, updated. e9d7fda78068f29e839d54f11a53a28e416d92f7

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 60fc37e2e29b3240b9ea3c947f9d8c9ddc19e433
Merge: 5dd2768942c17468925f63c4b6fd56c7d8e36a81 10bcb0853945cf9d0b1fcffde3c84370257fb155
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Apr 16 13:39:39 2015 +0200

    Merge commit '10bcb0853945cf9d0b1fcffde3c84370257fb155'
    
    Conflicts:
    	debian/control

 debian/changelog               | 12 ++++++++++++
 debian/libkf5kcmutils5.symbols |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index c5fc4b8,10a71ef..0e55b61
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +kcmutils (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:23:03 +0200
 +
+ kcmutils (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:33:02 +0200
+ 
 +kcmutils (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:38:34 +0100
 +
+ kcmutils (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:43:33 +0100
+ 
 +kcmutils (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:40 +0100
 +
  kcmutils (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kcmutils packaging