[SCM] kcmutils packaging branch, master, updated. debian/5.37.0-2-83-g25e1622

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4bfce3094e02dd1001f35ddeebf4027395699a5a
Merge: 383d104fcad942afbfcc18541766ff55c14a3d08 ddb5a569e054f9e9f2e10b20160cbd1772fb1c81
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 11:35:57 2015 -0700

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

 debian/changelog |  8 ++++++++
 debian/control   | 30 +++++++++++++++---------------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --cc debian/changelog
index 5cbc880,54f956f..771ecca
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,17 @@@
 -kcmutils (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +kcmutils (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:06:32 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 07:57:53 -0700
  
+ kcmutils (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:43 +0200
+ 
  kcmutils (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index fbc0576,0cfd154..0df07e5
--- 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),
-                libkf5configwidgets-dev (>= 5.12.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5declarative-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5iconthemes-dev (>= 5.12.0),
-                libkf5itemviews-dev (>= 5.12.0),
-                libkf5package-dev (>= 5.12.0),
-                libkf5service-dev (>= 5.12.0),
-                libkf5xmlgui-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               libkf5configwidgets-dev (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5declarative-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
 -               libkf5iconthemes-dev (>= 5.11.0~),
 -               libkf5itemviews-dev (>= 5.11.0~),
 -               libkf5package-dev (>= 5.11.0~),
 -               libkf5service-dev (>= 5.11.0~),
 -               libkf5xmlgui-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               libkf5configwidgets-dev (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5declarative-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5iconthemes-dev (>= 5.12.0~),
++               libkf5itemviews-dev (>= 5.12.0~),
++               libkf5package-dev (>= 5.12.0~),
++               libkf5service-dev (>= 5.12.0~),
++               libkf5xmlgui-dev (>= 5.12.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4),
                 qtdeclarative5-dev (>= 5.4)
@@@ -27,12 -27,12 +27,12 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5kcmutils-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5configwidgets-dev (>= 5.12.0),
-          libkf5iconthemes-dev (>= 5.12.0),
-          libkf5itemviews-dev (>= 5.12.0),
 -Depends: libkf5configwidgets-dev (>= 5.11.0~),
 -         libkf5iconthemes-dev (>= 5.11.0~),
 -         libkf5itemviews-dev (>= 5.11.0~),
++Depends: libkf5configwidgets-dev (>= 5.12.0~),
++         libkf5iconthemes-dev (>= 5.12.0~),
++         libkf5itemviews-dev (>= 5.12.0~),
           libkf5kcmutils5 (= ${binary:Version}),
-          libkf5service-dev (>= 5.12.0),
-          libkf5xmlgui-dev (>= 5.12.0),
 -         libkf5service-dev (>= 5.11.0~),
 -         libkf5xmlgui-dev (>= 5.11.0~),
++         libkf5service-dev (>= 5.12.0~),
++         libkf5xmlgui-dev (>= 5.12.0~),
           ${misc:Depends}
  Description: Extra APIs to write KConfig modules.
   Some utility classes for KSettings, KCModule and KPlugin.

-- 
kcmutils packaging