[SCM] kauth packaging branch, master, updated. debian/5.8.0-1-10-g31dd312

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 97c8863b0151d8718d6bf8f0386c4e00d9caaef1
Merge: e3bf59ab5b1ae2c39efce17dd11887c0aa767aa7 4a7b12d0936860eaf84b5a66810f4a5a89472d22
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Apr 16 13:35:45 2015 +0200

    Merge commit '4a7b12d0936860eaf84b5a66810f4a5a89472d22'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 577631f,c16b4a2..be1e9d1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,15 +1,35 @@@
 +kauth (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:15 +0200
 +
+ kauth (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:29:36 +0200
+ 
 +kauth (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * New pending patch: kauth_add_license
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 20 Mar 2015 14:13:24 +0100
 +
+ kauth (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:39:36 +0100
+ 
 +kauth (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 05 Mar 2015 22:52:23 +0100
 +
  kauth (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kauth packaging