[SCM] kdewebkit packaging branch, master, updated. debian/5.37.0-2-77-g23993fa

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 560ac1de87eebfc86c998a1f08ffda0a7423a018
Merge: bf529c9a61d8adc34a7590359b39c1326ffb11ac b916ce621a2e56a3f298e56b006ae70a58f3c92b
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 13:57:31 2015 -0700

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

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

diff --cc debian/changelog
index bb60f37,39906bb..835d2f4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,16 @@@
 -kdewebkit (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +kdewebkit (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
  
 -  * Vivid backport
 +  * New upstream release
  
 - -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:14:59 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:06:01 -0700
  
+ kdewebkit (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:36:09 +0200
+ 
  kdewebkit (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index 7adda0a,30e55a4..655b980
--- a/debian/control
+++ b/debian/control
@@@ -5,14 -5,14 +5,14 @@@ 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),
-                libkf5jobwidgets-dev (>= 5.12.0),
-                libkf5parts-dev (>= 5.12.0),
-                libkf5service-dev (>= 5.12.0),
-                libkf5wallet-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~),
 -               libkf5jobwidgets-dev (>= 5.11.0~),
 -               libkf5parts-dev (>= 5.11.0~),
 -               libkf5service-dev (>= 5.11.0~),
 -               libkf5wallet-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~),
++               libkf5jobwidgets-dev (>= 5.12.0~),
++               libkf5parts-dev (>= 5.12.0~),
++               libkf5service-dev (>= 5.12.0~),
++               libkf5wallet-dev (>= 5.12.0~),
                 libqt5webkit5-dev (>= 5.2~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4)

-- 
kdewebkit packaging