[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=ed8012d

The following commit has been merged in the master branch:
commit ed8012d2b5d4a757634d8b173500532e4c80efd9
Merge: b0e4914ec7ce71d12fd865ccca230fc1cfd6c188 bb10c8fd2eb439df299e349d15b6f1924b531625
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 22:45:27 2015 -0700

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

 debian/changelog |  8 ++++++++
 debian/control   | 22 +++++++++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index ed90512,8afe6b9..d64796d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
 +kservice (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Fix merge.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:23:31 -0700
 +
+ 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 ]
diff --cc debian/control
index 36d8058,05a2e3b..89b4597
--- 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),
-                kdoctools-dev (>= 5.12.0),
-                libkf5config-dev (>= 5.12.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5crash-dev (>= 5.12.0),
-                libkf5dbusaddons-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               kdoctools-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~),
++               extra-cmake-modules (>= 5.10.0~),
++               kdoctools-dev (>= 5.12.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5crash-dev (>= 5.12.0~),
++               libkf5dbusaddons-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
                 libxml2-utils,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4)
@@@ -27,10 -27,10 +27,10 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5service-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5config-dev (>= 5.12.0),
-          libkf5coreaddons-dev (>= 5.12.0),
-          libkf5dbusaddons-dev (>= 5.12.0),
-          libkf5i18n-dev (>= 5.12.0),
 -Depends: libkf5config-dev (>= 5.11.0~),
 -         libkf5coreaddons-dev (>= 5.11.0~),
 -         libkf5dbusaddons-dev (>= 5.11.0~),
 -         libkf5i18n-dev (>= 5.11.0~),
++Depends: libkf5config-dev (>= 5.12.0~),
++         libkf5coreaddons-dev (>= 5.12.0~),
++         libkf5dbusaddons-dev (>= 5.12.0~),
++         libkf5i18n-dev (>= 5.12.0~),
           libkf5service5 (= ${binary:Version}),
           ${misc:Depends},
           ${shlibs:Depends}

-- 
kservice packaging