[SCM] kded packaging branch, master, updated. ddbc52d271d64ef11eaeeb1ac562344cf90936a2

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 84507b1f4e0b736c7512d8a0120bc772fe2b0a10
Merge: a2214fbc0320772ced22bdf92cb0d3ed84075ba7 1a6cac690c07a77c1d7dc23e7425adbe983dc8af
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 09:53:52 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control
    	debian/kded5.install

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

diff --cc debian/changelog
index c06b46f,1bed927..5ac880d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,9 +1,27 @@@
 +kded (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:37:46 +0100
 +
+ kded (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:19:32 +0100
+ 
 +kded (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update copyright information.
 +  * Update install files.
 +  * Update watch file.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Feb 2015 17:56:20 +0100
 +
  kded (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index adfeae1,86c7f46..d411126
--- a/debian/control
+++ b/debian/control
@@@ -3,19 -3,39 +3,19 @@@ Section: lib
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 -               debhelper (>= 9.0.0),
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
-                kdoctools-dev (>= 5.6.0),
-                kinit-dev (>= 5.6.0),
-                libkf5config-dev (>= 5.6.0),
-                libkf5coreaddons-dev (>= 5.6.0),
-                libkf5crash-dev (>= 5.6.0),
-                libkf5dbusaddons-dev (>= 5.6.0),
-                libkf5service-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
+                kdoctools-dev (>= 5.7.0),
+                kinit-dev (>= 5.7.0),
 -               kio-dev (>= 5.7.0),
 -               libkf5archive-dev (>= 5.7.0),
 -               libkf5auth-dev (>= 5.7.0),
 -               libkf5bookmarks-dev (>= 5.7.0),
 -               libkf5codecs-dev (>= 5.7.0),
 -               libkf5completion-dev (>= 5.7.0),
+                libkf5config-dev (>= 5.7.0),
 -               libkf5configwidgets-dev (>= 5.7.0),
+                libkf5coreaddons-dev (>= 5.7.0),
+                libkf5crash-dev (>= 5.7.0),
+                libkf5dbusaddons-dev (>= 5.7.0),
 -               libkf5globalaccel-dev (>= 5.7.0),
 -               libkf5guiaddons-dev (>= 5.7.0),
 -               libkf5i18n-dev (>= 5.7.0),
 -               libkf5iconthemes-dev (>= 5.7.0),
 -               libkf5itemviews-dev (>= 5.7.0),
 -               libkf5jobwidgets-dev (>= 5.7.0),
 -               libkf5kjs-dev (>= 5.7.0),
+                libkf5service-dev (>= 5.7.0),
 -               libkf5solid-dev (>= 5.7.0),
 -               libkf5sonnet-dev (>= 5.7.0),
 -               libkf5textwidgets-dev (>= 5.7.0),
 -               libkf5widgetsaddons-dev (>= 5.7.0),
 -               libkf5windowsystem-dev (>= 5.7.0),
 -               libkf5xmlgui-dev (>= 5.7.0),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev
 -Standards-Version: 3.9.5
 +               qtbase5-dev (>= 5.2)
 +Standards-Version: 3.9.6
  Homepage: https://projects.kde.org/projects/frameworks/kded
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kded.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kded.git
@@@ -23,11 -43,11 +23,11 @@@
  Package: kded5-dev
  Section: libdevel
  Architecture: any
 -Depends: kded5,
 -         libkf5coreaddons-dev,
 -         libkf5crash-dev,
 -         libkf5dbusaddons-dev,
 -         libkf5service-dev,
 +Depends: kded5 (= ${binary:Version}),
-          libkf5coreaddons-dev (>= 5.6.0),
-          libkf5crash-dev (>= 5.6.0),
-          libkf5dbusaddons-dev (>= 5.6.0),
-          libkf5service-dev (>= 5.6.0),
++         libkf5coreaddons-dev (>= 5.7.0),
++         libkf5crash-dev (>= 5.7.0),
++         libkf5dbusaddons-dev (>= 5.7.0),
++         libkf5service-dev (>= 5.7.0),
           ${misc:Depends}
  Description: Extensible daemon for providing session services
   KDED runs in the background and performs a number of small tasks.

-- 
kded packaging