[SCM] kded packaging branch, master, updated. debian/5.37.0-2-77-g4322ba8

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 07881ab153732aee5d65667e7bd53ff71f36ea30
Merge: b7af101bf781129f0615b5da1aa2b483dede231d 20e4f319b77ba4dcf3cceae6ba88da62877756b9
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 12:36:58 2015 -0700

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

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

diff --cc debian/changelog
index 7d4aab7,5529c60..be556d9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,17 @@@
 -kded (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +kded (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:12:20 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:03:27 -0700
  
+ kded (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 12:35:55 +0200
+ 
  kded (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index 1c2f9f3,d02ccea..cf1f940
--- a/debian/control
+++ b/debian/control
@@@ -5,14 -5,14 +5,14 @@@ 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),
-                kinit-dev (>= 5.12.0),
-                libkf5config-dev (>= 5.12.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5crash-dev (>= 5.12.0),
-                libkf5dbusaddons-dev (>= 5.12.0),
-                libkf5service-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               kdoctools-dev (>= 5.11.0~),
 -               kinit-dev (>= 5.11.0~),
 -               libkf5config-dev (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5crash-dev (>= 5.11.0~),
 -               libkf5dbusaddons-dev (>= 5.11.0~),
 -               libkf5service-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               kdoctools-dev (>= 5.12.0~),
++               kinit-dev (>= 5.12.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5crash-dev (>= 5.12.0~),
++               libkf5dbusaddons-dev (>= 5.12.0~),
++               libkf5service-dev (>= 5.12.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4)
  Standards-Version: 3.9.6
@@@ -24,10 -24,10 +24,10 @@@ Package: kded5-de
  Section: libdevel
  Architecture: any
  Depends: kded5 (= ${binary:Version}),
-          libkf5coreaddons-dev (>= 5.12.0),
-          libkf5crash-dev (>= 5.12.0),
-          libkf5dbusaddons-dev (>= 5.12.0),
-          libkf5service-dev (>= 5.12.0),
 -         libkf5coreaddons-dev (>= 5.11.0~),
 -         libkf5crash-dev (>= 5.11.0~),
 -         libkf5dbusaddons-dev (>= 5.11.0~),
 -         libkf5service-dev (>= 5.11.0~),
++         libkf5coreaddons-dev (>= 5.12.0~),
++         libkf5crash-dev (>= 5.12.0~),
++         libkf5dbusaddons-dev (>= 5.12.0~),
++         libkf5service-dev (>= 5.12.0~),
           ${misc:Depends}
  Description: Extensible daemon for providing session services
   KDED runs in the background and performs a number of small tasks.

-- 
kded packaging