[SCM] kglobalaccel packaging branch, master, updated. debian/5.9.0-1-22-g5220077

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 8d537876153192410ba8bd1a077d4762e52722dd
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Jun 28 14:22:00 2015 +0200

    Fix changelog after merge.
---
 debian/changelog | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0846660..358a1ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,13 +4,10 @@ kglobalaccel (5.11.0-1~) UNRELEASED; urgency=medium
   * Update symbols files.
   * New upstream release (5.11.0).
 
- -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 14:11:28 +0200
-
-kglobalaccel (5.10.0-0ubuntu2) UNRELEASED; urgency=medium
-
-  * Build-dep on libxcb-xtest0-dev
+  [ Jonathan Riddell ]
+  * Build-dep on libxcb-xtest0-dev.
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 15 Jun 2015 07:11:29 +0200
+ -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 14:11:28 +0200
 
 kglobalaccel (5.10.0-0ubuntu1) wily; urgency=medium
 
@@ -22,9 +19,9 @@ kglobalaccel (5.10.0-0ubuntu1) wily; urgency=medium
   * New upstream release
 
   [ Scarlett Clark ]
-  * Fix install file. 
-  * Force rebuild. Launchpad was down. 
-  * Fix another install file. 
+  * Fix install file.
+  * Force rebuild. Launchpad was down.
+  * Fix another install file.
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:44:35 +0200
 
@@ -122,7 +119,7 @@ kglobalaccel (5.2.0-0ubuntu1) utopic; urgency=medium
 kglobalaccel (5.1.0-0ubuntu1) utopic; urgency=medium
 
   [ Scarlett Clark ]
-  * Update copyright to match licensing to source 
+  * Update copyright to match licensing to source
 
   [ José Manuel Santamaría Lema ]
   * Update libraries *.install paths so a soname bump doesn't go

-- 
kglobalaccel packaging