[SCM] kservice packaging branch, master, updated. debian/5.8.0-1-10-g0c3375c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a6aaabe25930e0b6996dacd9b33a81d0af205a11
Merge: 3c5129414801b588b02f0880f29da8f769dda07a db25e396b5c2b87c8ed432e223911ed1d6df68fc
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:26:35 2015 +0200

    Merge commit 'db25e396b5c2b87c8ed432e223911ed1d6df68fc'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index b9aeb2d,0c6b549..ed4dab8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +kservice (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:26:02 +0200
 +
+ kservice (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:23:56 +0200
+ 
 +kservice (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:39:07 +0100
 +
+ kservice (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:31:09 +0100
+ 
 +kservice (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:55 +0100
 +
  kservice (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kservice packaging