[SCM] khtml packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-4-ge1bef6c

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit b544b2be064893b5c77f10f86e0972a3ada81d30
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Feb 5 09:28:23 2015 +0100

    Bump Standards-Version to 3.9.6, no changes needed.
---
 debian/changelog |  3 +++
 debian/control   | 54 +++++++++++++++++++-----------------------------------
 2 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 47dee8c..ef5c3f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 khtml (5.6.0-1~) UNRELEASED; urgency=medium
 
   * Prepare initial Debian release.
+  * Update build dependencies to build against experimental and to
+    follow cmake.
+  * Bump Standards-Version to 3.9.6, no changes needed.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 05 Feb 2015 09:19:16 +0100
 
diff --git a/debian/control b/debian/control
index f138db0..2faed1b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,52 +3,37 @@ Section: libs
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake,
-               debhelper (>= 9.0.0),
+Build-Depends: cmake (>= 2.8.12),
+               debhelper (>= 9),
                extra-cmake-modules (>= 1.6.0),
-               kinit-dev (>= 5.6.0),
                kio-dev (>= 5.6.0),
                libgif-dev,
                libjpeg-dev,
                libkf5archive-dev (>= 5.6.0),
-               libkf5attica-dev (>= 5.6.0),
-               libkf5auth-dev (>= 5.6.0),
-               libkf5bookmarks-dev (>= 5.6.0),
                libkf5codecs-dev (>= 5.6.0),
-               libkf5completion-dev (>= 5.6.0),
-               libkf5config-dev (>= 5.6.0),
-               libkf5configwidgets-dev (>= 5.6.0),
-               libkf5coreaddons-dev (>= 5.6.0),
-               libkf5crash-dev (>= 5.6.0),
-               libkf5dbusaddons-dev (>= 5.6.0),
                libkf5globalaccel-dev (>= 5.6.0),
-               libkf5guiaddons-dev (>= 5.6.0),
                libkf5i18n-dev (>= 5.6.0),
                libkf5iconthemes-dev (>= 5.6.0),
-               libkf5itemviews-dev (>= 5.6.0),
-               libkf5jobwidgets-dev (>= 5.6.0),
                libkf5kjs-dev (>= 5.6.0),
                libkf5notifications-dev (>= 5.6.0),
                libkf5parts-dev (>= 5.6.0),
-               libkf5service-dev (>= 5.6.0),
-               libkf5solid-dev (>= 5.6.0),
                libkf5sonnet-dev (>= 5.6.0),
                libkf5textwidgets-dev (>= 5.6.0),
                libkf5wallet-dev (>= 5.6.0),
                libkf5widgetsaddons-dev (>= 5.6.0),
                libkf5windowsystem-dev (>= 5.6.0),
                libkf5xmlgui-dev (>= 5.6.0),
-               libphonon4qt5-dev,
-               libphonon4qt5experimental-dev,
+               libphonon4qt5-dev (>= 4:4.6.0),
+               libphonon4qt5experimental-dev (>= 4:4.6.0),
                libpng12-dev,
                libqt5x11extras5-dev,
                libssl-dev,
                pkg-kde-tools (>= 0.15.15ubuntu1~),
-               qtbase5-dev,
+               qtbase5-dev (>= 5.2.0),
                xauth,
                xvfb,
                zlib1g-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://projects.kde.org/projects/frameworks/khtml
 XS-Testsuite: autopkgtest
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/khtml.git
@@ -57,21 +42,20 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/khtml.git
 Package: libkf5khtml-dev
 Section: libdevel
 Architecture: any
-Depends: kio-dev,
-         libkf5archive-dev,
-         libkf5bookmarks-dev,
-         libkf5globalaccel-dev,
-         libkf5i18n-dev,
-         libkf5iconthemes-dev,
+Depends: kio-dev (>= 5.6.0),
+         libkf5archive-dev (>= 5.6.0),
+         libkf5globalaccel-dev (>= 5.6.0),
+         libkf5i18n-dev (>= 5.6.0),
+         libkf5iconthemes-dev (>= 5.6.0),
          libkf5khtml5 (= ${binary:Version}),
-         libkf5kjs-dev,
-         libkf5notifications-dev,
-         libkf5parts-dev,
-         libkf5sonnet-dev,
-         libkf5wallet-dev,
-         libkf5widgetsaddons-dev,
-         libkf5windowsystem-dev,
-         qtbase5-dev,
+         libkf5kjs-dev (>= 5.6.0),
+         libkf5notifications-dev (>= 5.6.0),
+         libkf5parts-dev (>= 5.6.0),
+         libkf5sonnet-dev (>= 5.6.0),
+         libkf5wallet-dev (>= 5.6.0),
+         libkf5widgetsaddons-dev (>= 5.6.0),
+         libkf5windowsystem-dev (>= 5.6.0),
+         qtbase5-dev (>= 5.2.0),
          ${misc:Depends}
 Description: HTML widget and component
  KHTML is a web rendering engine, based on the KParts technology and

-- 
khtml packaging