[SCM] kglobalaccel packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-ga410f1e

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit a410f1ece1896673698a04d0c14ab287f6fc27e6
Merge: ee0fa72e667678321d78081effcdf3918f1bb222 b060a9ceb567015c88f826765885c3176a00a436
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 10:50:48 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_vivid_backports' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

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

diff --cc debian/changelog
index 7434b54,4d1d18e..3863123
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,13 +1,26 @@@
+ kglobalaccel (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   [ Jonathan Riddell ]
+   * Build-dep on libxcb-xtest0-dev
+ 
+   [ Scarlett Clark ]
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:17:24 -0700
+ 
 +kglobalaccel (5.11.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.10.0).
 +  * Update symbols files.
 +  * New upstream release (5.11.0).
 +
 +  [ Jonathan Riddell ]
 +  * Build-dep on libxcb-xtest0-dev.
 +
 +  [ Maximiliano Curia ]
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 14:29:56 +0200
 +
  kglobalaccel (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
kglobalaccel packaging