[SCM] khtml packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-7-ged423f0

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit ed423f09ed630c26fb1609c4e8f2f26a65263fa8
Merge: 665b83d6a7bb21d1ee0c6c400d4ca9b271111c8f 21633b5c2d3a1387925533186b075accfbc8215d
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 14:46:24 2015 -0700

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

 debian/changelog            | 12 ++++++++++
 debian/control              | 56 ++++++++++++++++++++++-----------------------
 debian/libkf5khtml5.symbols | 31 ++++++++++++-------------
 3 files changed, 54 insertions(+), 45 deletions(-)

diff --cc debian/changelog
index cedc600,4b6f26d..781185e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,21 @@@
 -khtml (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +khtml (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:18:39 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:09:31 -0700
  
+ khtml (5.11.0-1) unstable; urgency=medium
+ 
+   [ Maximiliano Curia ]
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+   [ Felix Geyer ]
+   * Update the symbols file.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 14:55:30 +0200
+ 
  khtml (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index ae83038,6f8fa7b..1e2ec4d
--- a/debian/control
+++ b/debian/control
@@@ -5,24 -5,24 +5,24 @@@ 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),
 -               extra-cmake-modules (>= 5.11.0~),
 -               kio-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               kio-dev (>= 5.12.0~),
                 libgif-dev,
                 libjpeg-dev,
-                libkf5archive-dev (>= 5.12.0),
-                libkf5codecs-dev (>= 5.12.0),
-                libkf5globalaccel-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5iconthemes-dev (>= 5.12.0),
-                libkf5kjs-dev (>= 5.12.0),
-                libkf5notifications-dev (>= 5.12.0),
-                libkf5parts-dev (>= 5.12.0),
-                libkf5sonnet-dev (>= 5.12.0),
-                libkf5textwidgets-dev (>= 5.12.0),
-                libkf5wallet-dev (>= 5.12.0),
-                libkf5widgetsaddons-dev (>= 5.12.0),
-                libkf5windowsystem-dev (>= 5.12.0),
-                libkf5xmlgui-dev (>= 5.12.0),
 -               libkf5archive-dev (>= 5.11.0~),
 -               libkf5codecs-dev (>= 5.11.0~),
 -               libkf5globalaccel-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
 -               libkf5iconthemes-dev (>= 5.11.0~),
 -               libkf5kjs-dev (>= 5.11.0~),
 -               libkf5notifications-dev (>= 5.11.0~),
 -               libkf5parts-dev (>= 5.11.0~),
 -               libkf5sonnet-dev (>= 5.11.0~),
 -               libkf5textwidgets-dev (>= 5.11.0~),
 -               libkf5wallet-dev (>= 5.11.0~),
 -               libkf5widgetsaddons-dev (>= 5.11.0~),
 -               libkf5windowsystem-dev (>= 5.11.0~),
 -               libkf5xmlgui-dev (>= 5.11.0~),
++               libkf5archive-dev (>= 5.12.0~),
++               libkf5codecs-dev (>= 5.12.0~),
++               libkf5globalaccel-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5iconthemes-dev (>= 5.12.0~),
++               libkf5kjs-dev (>= 5.12.0~),
++               libkf5notifications-dev (>= 5.12.0~),
++               libkf5parts-dev (>= 5.12.0~),
++               libkf5sonnet-dev (>= 5.12.0~),
++               libkf5textwidgets-dev (>= 5.12.0~),
++               libkf5wallet-dev (>= 5.12.0~),
++               libkf5widgetsaddons-dev (>= 5.12.0~),
++               libkf5windowsystem-dev (>= 5.12.0~),
++               libkf5xmlgui-dev (>= 5.12.0~),
                 libphonon4qt5-dev (>= 4:4.6.0),
                 libphonon4qt5experimental-dev (>= 4:4.6.0),
                 libpng12-dev,
@@@ -41,19 -41,19 +41,19 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5khtml-dev
  Section: libdevel
  Architecture: any
- Depends: kio-dev (>= 5.12.0),
-          libkf5archive-dev (>= 5.12.0),
-          libkf5globalaccel-dev (>= 5.12.0),
-          libkf5i18n-dev (>= 5.12.0),
-          libkf5iconthemes-dev (>= 5.12.0),
 -Depends: kio-dev (>= 5.11.0~),
 -         libkf5archive-dev (>= 5.11.0~),
 -         libkf5globalaccel-dev (>= 5.11.0~),
 -         libkf5i18n-dev (>= 5.11.0~),
 -         libkf5iconthemes-dev (>= 5.11.0~),
++Depends: kio-dev (>= 5.12.0~),
++         libkf5archive-dev (>= 5.12.0~),
++         libkf5globalaccel-dev (>= 5.12.0~),
++         libkf5i18n-dev (>= 5.12.0~),
++         libkf5iconthemes-dev (>= 5.12.0~),
           libkf5khtml5 (= ${binary:Version}),
-          libkf5kjs-dev (>= 5.12.0),
-          libkf5notifications-dev (>= 5.12.0),
-          libkf5parts-dev (>= 5.12.0),
-          libkf5sonnet-dev (>= 5.12.0),
-          libkf5wallet-dev (>= 5.12.0),
-          libkf5widgetsaddons-dev (>= 5.12.0),
-          libkf5windowsystem-dev (>= 5.12.0),
 -         libkf5kjs-dev (>= 5.11.0~),
 -         libkf5notifications-dev (>= 5.11.0~),
 -         libkf5parts-dev (>= 5.11.0~),
 -         libkf5sonnet-dev (>= 5.11.0~),
 -         libkf5wallet-dev (>= 5.11.0~),
 -         libkf5widgetsaddons-dev (>= 5.11.0~),
 -         libkf5windowsystem-dev (>= 5.11.0~),
++         libkf5kjs-dev (>= 5.12.0~),
++         libkf5notifications-dev (>= 5.12.0~),
++         libkf5parts-dev (>= 5.12.0~),
++         libkf5sonnet-dev (>= 5.12.0~),
++         libkf5wallet-dev (>= 5.12.0~),
++         libkf5widgetsaddons-dev (>= 5.12.0~),
++         libkf5windowsystem-dev (>= 5.12.0~),
           qtbase5-dev (>= 5.4),
           ${misc:Depends}
  Description: HTML widget and component

-- 
khtml packaging