[SCM] kparts packaging branch, master, updated. debian/5.37.0-2-83-g5a53f7e

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 0660e3d3106782431a34512970050dacc549c37a
Merge: a098ee22d558b1b2d3ec84c511f214b11336216f 0a676a443170d91f12b7c4b0cb97ef95bb2913da
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 19:42:09 2015 -0700

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

 debian/changelog |  9 +++++++++
 debian/control   | 32 ++++++++++++++++----------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --cc debian/changelog
index 60d4d70,7523eb9..43528f5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,17 @@@
++<<<<<<< HEAD
 +kparts (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:20:19 -0700
++=======
+ kparts (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 10:31:58 +0200
++>>>>>>> origin/kubuntu_unstable
  
  kparts (5.10.0-0ubuntu1) wily; urgency=medium
  
diff --cc debian/control
index 722995c,4397dd3..648b067
--- a/debian/control
+++ b/debian/control
@@@ -5,19 -5,19 +5,19 @@@ 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),
-                kio-dev (>= 5.12.0),
-                libkf5config-dev (>= 5.12.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5iconthemes-dev (>= 5.12.0),
-                libkf5itemviews-dev (>= 5.12.0),
-                libkf5jobwidgets-dev (>= 5.12.0),
-                libkf5notifications-dev (>= 5.12.0),
-                libkf5service-dev (>= 5.12.0),
-                libkf5textwidgets-dev (>= 5.12.0),
-                libkf5widgetsaddons-dev (>= 5.12.0),
-                libkf5xmlgui-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               kio-dev (>= 5.11.0~),
 -               libkf5config-dev (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
 -               libkf5iconthemes-dev (>= 5.11.0~),
 -               libkf5itemviews-dev (>= 5.10.0),
 -               libkf5jobwidgets-dev (>= 5.11.0~),
 -               libkf5notifications-dev (>= 5.11.0~),
 -               libkf5service-dev (>= 5.11.0~),
 -               libkf5textwidgets-dev (>= 5.11.0~),
 -               libkf5widgetsaddons-dev (>= 5.11.0~),
 -               libkf5xmlgui-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               kio-dev (>= 5.12.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5iconthemes-dev (>= 5.12.0~),
++               libkf5itemviews-dev (>= 5.12.0~),
++               libkf5jobwidgets-dev (>= 5.12.0~),
++               libkf5notifications-dev (>= 5.12.0~),
++               libkf5service-dev (>= 5.12.0~),
++               libkf5textwidgets-dev (>= 5.12.0~),
++               libkf5widgetsaddons-dev (>= 5.12.0~),
++               libkf5xmlgui-dev (>= 5.12.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4),
                 xauth,
@@@ -31,11 -31,11 +31,11 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5parts-dev
  Section: libdevel
  Architecture: any
 -Depends: kio-dev (>= 5.11.0~),
 -         libkf5notifications-dev (>= 5.11.0~),
 +Depends: kio-dev (>= 5.12.0),
-          libkf5notifications-dev (>= 5.12.0),
++         libkf5notifications-dev (>= 5.12.0~),
           libkf5parts5 (= ${binary:Version}),
-          libkf5textwidgets-dev (>= 5.12.0),
-          libkf5xmlgui-dev (>= 5.12.0),
 -         libkf5textwidgets-dev (>= 5.11.0~),
 -         libkf5xmlgui-dev (>= 5.11.0~),
++         libkf5textwidgets-dev (>= 5.12.0~),
++         libkf5xmlgui-dev (>= 5.12.0~),
           ${misc:Depends}
  Description: development files for kparts
   Framework providing elaborate user-interface components.

-- 
kparts packaging