[SCM] kservice packaging branch, master, updated. debian/5.37.0-2-99-gbdfc711

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit bb10c8fd2eb439df299e349d15b6f1924b531625
Merge: 1dce292dc791a5904ccf46882cf8dd9827ecb332 bbf665720b9e116b181054c1950bfcc5e583da8e
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:48:52 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 3088be0,b5a6a58..8afe6b9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ kservice (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>  Sun, 28 Jun 2015 14:51:03 +0200
+ 
 +kservice (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:06:31 +0200
 +
  kservice (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).
diff --cc debian/control
index e3d0b75,a7c566e..05a2e3b
--- a/debian/control
+++ b/debian/control
@@@ -8,13 -8,13 +8,13 @@@ Build-Depends: cmake (>= 2.8.12)
                 debhelper (>= 9),
                 docbook-xml,
                 docbook-xsl,
-                extra-cmake-modules (>= 5.10.0),
+                extra-cmake-modules (>= 5.11.0~),
 -               kdoctools-dev (>= 5.7.0),
 +               kdoctools-dev (>= 5.10.0),
-                libkf5config-dev (>= 5.10.0),
-                libkf5coreaddons-dev (>= 5.10.0),
-                libkf5crash-dev (>= 5.10.0),
-                libkf5dbusaddons-dev (>= 5.10.0),
-                libkf5i18n-dev (>= 5.10.0),
+                libkf5config-dev (>= 5.11.0~),
+                libkf5coreaddons-dev (>= 5.11.0~),
+                libkf5crash-dev (>= 5.11.0~),
+                libkf5dbusaddons-dev (>= 5.11.0~),
+                libkf5i18n-dev (>= 5.11.0~),
                 libxml2-utils,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4)

-- 
kservice packaging