[SCM] kdesu packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-2-g7cc0097

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 7cc009774e8d1279084a9ab784a1732e13e8c707
Merge: dda8cf556e5b3523e32e39ba5c7df7ddbcee6e47 bce4752d99a5fcf383a2b245a867802b7460581b
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 10:17:41 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 0302d0f,d886282..26d1da0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,12 +1,26 @@@
+ kdesu (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   [ José Manuel Santamaría Lema ]
+   * libkf5su-data Breaks/Replaces libkf5su5 (<< 5.10)
+ 
+   [ Scarlett Clark ]
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:14:22 -0700
++ 
 +kdesu (5.11.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.11.0).
 +
 +  [ José Manuel Santamaría Lema ]
 +  * libkf5su-data Breaks/Replaces libkf5su5 (<< 5.10)
 +
 +  [ Jonathan Riddell ]
 +  * Remove kubuntu_sudo-support.diff now upstream
 +
 +  [ Maximiliano Curia ]
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 15:56:23 +0200
  
  kdesu (5.10.0-0ubuntu1) wily; urgency=medium
  

-- 
kdesu packaging