[SCM] kconfig packaging branch, master, updated. debian/5.8.0-1-12-g756399a

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 522ca28023a02e0f965f5b9084ee0c2815e58942
Merge: 8a98a82b5cdfc1108397c80cf118f5671337a582 ad45b46115e6a2d000d324a20ebb76b449c3ab99
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 15:13:51 2015 +0200

    Merge commit 'ad45b46115e6a2d000d324a20ebb76b449c3ab99'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index af57f59,fc5b4ec..f3b0e31
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +kconfig (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:21:35 +0200
 +
+ kconfig (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:17:19 +0200
+ 
 +kconfig (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:06 +0100
 +
+ kconfig (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:29:07 +0100
+ 
 +kconfig (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:09:41 +0100
 +
  kconfig (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kconfig packaging