[SCM] krunner packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-5-g78afeb0

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 78afeb08dd072510e2b20a2fce9a7fdb8c4c8925
Merge: afdfd5a67f9f9818e9de2c9de9f9914f3e442dd4 39607dea77f94e3b3b8fb43af31af7be2a020e63
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 22:21:03 2015 -0700

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

 debian/changelog |  8 ++++++++
 debian/control   | 20 ++++++++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index e2cc838,0f045ba..9a8d2a4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
 +krunner (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Fix merge
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:22:58 -0700
 +
+ krunner (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 21:23:04 +0200
+ 
  krunner (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index 09ffa90,137ea93..891edd0
--- 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),
-                kio-dev (>= 5.12.0),
-                libkf5config-dev (>= 5.12.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5service-dev (>= 5.12.0),
-                libkf5solid-dev (>= 5.12.0),
-                libkf5threadweaver-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               kio-dev (>= 5.11.0~),
 -               libkf5config-dev (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
 -               libkf5service-dev (>= 5.11.0~),
 -               libkf5solid-dev (>= 5.11.0~),
 -               libkf5threadweaver-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               kio-dev (>= 5.12.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5service-dev (>= 5.12.0~),
++               libkf5solid-dev (>= 5.12.0~),
++               libkf5threadweaver-dev (>= 5.12.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
-                plasma-framework-dev (>= 5.12.0),
 -               plasma-framework-dev (>= 5.11.0~),
++               plasma-framework-dev (>= 5.12.0~),
                 qtbase5-dev (>= 5.4),
                 qtdeclarative5-dev (>= 5.4),
                 xauth,
@@@ -29,7 -29,7 +29,7 @@@ Package: libkf5runner-de
  Section: libdevel
  Architecture: any
  Depends: libkf5runner5 (= ${binary:Version}),
-          plasma-framework-dev (>= 5.12.0),
 -         plasma-framework-dev (>= 5.11.0~),
++         plasma-framework-dev (>= 5.12.0~),
           qtbase5-dev (>= 5.4),
           ${misc:Depends}
  Description: development files for krunner

-- 
krunner packaging