[SCM] kdesu packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-4-gb0767da

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit b0767dad5da7800aaba9ae17643081f07470d74a
Merge: 90705651063e44421e4dda0de8118959123c49c4 7cc009774e8d1279084a9ab784a1732e13e8c707
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 13:47:11 2015 -0700

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

 debian/changelog                         | 15 +++++++++++++++
 debian/control                           | 12 ++++++------
 debian/patches/kubuntu_sudo-support.diff | 26 --------------------------
 debian/patches/series                    |  1 -
 debian/rules                             |  4 ++--
 5 files changed, 23 insertions(+), 35 deletions(-)

diff --cc debian/changelog
index 386a089,26d1da0..1643909
--- a/debian/changelog
+++ b/debian/changelog
@@@ -4,9 -4,23 +4,24 @@@ kdesu (5.12.0-0ubuntu1) UNRELEASED; urg
    * libkf5su-data Breaks/Replaces libkf5su5 (<< 5.10)
  
    [ Scarlett Clark ]
 -  * Vivid backport
 +  * New upstream release
++  * Fix merge, remove unused broken backport.
  
 - -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:14:22 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:05:25 -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
  
diff --cc debian/control
index 5f4247f,53564cb..9a41b3f
--- a/debian/control
+++ b/debian/control
@@@ -5,11 -5,11 +5,11 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 5.10.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5pty-dev (>= 5.12.0),
-                libkf5service-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
 -               libkf5pty-dev (>= 5.11.0~),
 -               libkf5service-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5pty-dev (>= 5.12.0~),
++               libkf5service-dev (>= 5.12.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4)
  Standards-Version: 3.9.6
@@@ -21,7 -21,7 +21,7 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5su-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5pty-dev (>= 5.12.0),
 -Depends: libkf5pty-dev (>= 5.11.0~),
++Depends: libkf5pty-dev (>= 5.12.0~),
           libkf5su5 (= ${binary:Version}),
           ${misc:Depends}
  Description: development files for kdesu

-- 
kdesu packaging