[SCM] kinit packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-9-g53b811f

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 53b811fbd937a2a1a6429794f63c798c7d0fa37a
Merge: aaecfba2b17e80e957e6781ad52a7967528006bd 287889adb8619c138d1ffec3034f017af574ba55
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 15:45:24 2015 -0700

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

 debian/changelog | 10 +++++++++-
 debian/control   | 16 ++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index 286237d,35f0ea8..e12597d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,17 @@@
 -kinit (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +kinit (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
  
 -  * Vivid backport
 +  * New upstream release
++  * Fix merge, remove unused broken backport.
  
 - -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:21:59 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:12:47 -0700
  
+ kinit (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 10:19:51 +0200
+ 
  kinit (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index cf8f8aa,0a95c6b..d714583
--- a/debian/control
+++ b/debian/control
@@@ -5,16 -5,16 +5,16 @@@ 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),
-                kdoctools-dev (>= 5.12.0),
-                kio-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               kdoctools-dev (>= 5.11.0~),
 -               kio-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               kdoctools-dev (>= 5.12.0~),
++               kio-dev (>= 5.12.0~),
                 libcap-dev,
                 libcap2-bin,
-                libkf5config-dev (>= 5.12.0),
-                libkf5crash-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5service-dev (>= 5.12.0),
-                libkf5windowsystem-dev (>= 5.12.0),
 -               libkf5config-dev (>= 5.11.0~),
 -               libkf5crash-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
 -               libkf5service-dev (>= 5.11.0~),
 -               libkf5windowsystem-dev (>= 5.11.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5crash-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5service-dev (>= 5.12.0~),
++               libkf5windowsystem-dev (>= 5.12.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4)
  Standards-Version: 3.9.6

-- 
kinit packaging