[SCM] kglobalaccel packaging branch, master, updated. debian/5.6.0-1-33-g205dc44

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 30da60656278174263d6eacdb00f3b079252464a
Merge: bf38bed6a016724766788ce22b373aaacad570bb 62128152ed1389b0fc05598d79433969fb5906ef
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:16:08 2015 +0200

    Merge commit '62128152ed1389b0fc05598d79433969fb5906ef'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 34f25d3,cc1c3ec..37dfabb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,15 +1,36 @@@
 +kglobalaccel (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:22:00 +0200
 +
+ kglobalaccel (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:29:10 +0200
+ 
 +kglobalaccel (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:51 +0100
 +
+ kglobalaccel (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:39:08 +0100
+ 
 +kglobalaccel (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +  * Update build dependencies.
 +  * Add new libkf5globalaccel-bin package.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Mar 2015 22:57:47 +0100
 +
  kglobalaccel (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kglobalaccel packaging