[SCM] kdeclarative packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-4-gc3fa5ed

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 42e50793e04ff587a121b9f363182991cc4713d3
Merge: 825b76981486c69b12cecf16333afc8f21e4635e 7f6db706a947ad936691e4249789a59efa54492f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 10:04:18 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control
    	debian/libkf5declarative-dev.install
    	debian/libkf5quickaddons5.symbols

 debian/changelog                                 | 21 ++++++++++++++
 debian/control                                   | 21 +++++++-------
 debian/libkf5quickaddons5.symbols                |  8 +-----
 debian/patches/kubuntu_fix_epoxy_vs_qopengl.diff | 35 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 5 files changed, 69 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index b8eda86,652e307..849a34b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,24 +1,45 @@@
 +kdeclarative (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:38:39 +0100
 +
+ kdeclarative (5.7.0-0ubuntu3) vivid; urgency=medium
+ 
+   * Refine kubuntu_fix_epoxy_vs_qopengl.diff to prevent Qt from
+     doing a second typedef on GLdouble
+ 
+  -- Harald Sitter <sitter at kde.org>  Fri, 13 Feb 2015 16:49:06 +0100
+ 
+ kdeclarative (5.7.0-0ubuntu2) vivid; urgency=medium
+ 
+   * Add kubuntu_fix_epoxy_vs_qopengl.diff in an attempt to fix
+     armhf builds failing from conflicting typedefs between epoxy
+     and qopengl
+ 
+  -- Harald Sitter <sitter at kde.org>  Fri, 13 Feb 2015 16:11:45 +0100
+ 
+ kdeclarative (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:48:37 +0100
+ 
 +kdeclarative (5.6.0-1) experimental; 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.
 +  * Add acc autopkgtests.
 +  * Update copyright information.
 +  * Update install files.
 +  * Update watch file.
 +  * Update symbols files.
 +  * Add missing dev dependency (thanks to acc headers check)
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 30 Jan 2015 14:13:38 +0100
 +
  kdeclarative (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 62b7a1b,5125903..38e930f
--- a/debian/control
+++ b/debian/control
@@@ -3,24 -3,39 +3,25 @@@ Section: lib
  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),
-                kio-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
+                kio-dev (>= 5.7.0),
                 libepoxy-dev,
-                libkf5config-dev (>= 5.6.0),
-                libkf5globalaccel-dev (>= 5.6.0),
-                libkf5guiaddons-dev (>= 5.6.0),
-                libkf5i18n-dev (>= 5.6.0),
-                libkf5iconthemes-dev (>= 5.6.0),
-                libkf5widgetsaddons-dev (>= 5.6.0),
-                libkf5windowsystem-dev (>= 5.6.0),
 -               libkf5auth-dev (>= 5.7.0),
 -               libkf5bookmarks-dev (>= 5.7.0),
 -               libkf5codecs-dev (>= 5.7.0),
 -               libkf5completion-dev (>= 5.7.0),
+                libkf5config-dev (>= 5.7.0),
 -               libkf5configwidgets-dev (>= 5.7.0),
 -               libkf5coreaddons-dev (>= 5.7.0),
 -               libkf5dbusaddons-dev (>= 5.7.0),
+                libkf5globalaccel-dev (>= 5.7.0),
+                libkf5guiaddons-dev (>= 5.7.0),
+                libkf5i18n-dev (>= 5.7.0),
+                libkf5iconthemes-dev (>= 5.7.0),
+                libkf5itemviews-dev (>= 5.7.0),
 -               libkf5jobwidgets-dev (>= 5.7.0),
 -               libkf5kjs-dev (>= 5.7.0),
 -               libkf5service-dev (>= 5.7.0),
 -               libkf5solid-dev (>= 5.7.0),
 -               libkf5sonnet-dev (>= 5.7.0),
 -               libkf5textwidgets-dev (>= 5.7.0),
+                libkf5widgetsaddons-dev (>= 5.7.0),
+                libkf5windowsystem-dev (>= 5.7.0),
 -               libkf5xmlgui-dev (>= 5.7.0),
                 pkg-config,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev,
 +               qtbase5-dev (>= 5.2.0),
                 qtdeclarative5-dev,
                 qtscript5-dev
 -Standards-Version: 3.9.5
 +Standards-Version: 3.9.6
  Homepage: https://projects.kde.org/projects/frameworks/kdeclarative
  XS-Testsuite: autopkgtest
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kdeclarative.git
@@@ -29,11 -44,10 +30,11 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5declarative-dev
  Section: libdevel
  Architecture: any
- Depends: kio-dev (>= 5.6.0),
 -Depends: kio-dev,
++Depends: kio-dev (>= 5.7.0),
           libkf5declarative5 (= ${binary:Version}),
           libkf5quickaddons5 (= ${binary:Version}),
 -         qtbase5-dev,
 +         qtbase5-dev (>= 5.2.0),
 +         qtdeclarative5-dev,
           ${misc:Depends}
  Description: development files for kdeclarative
   Framework providing integration of QML and other KDE frameworks such

-- 
kdeclarative packaging