[SCM] kdeclarative packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-g370aff9

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 370aff96958c9ebe3c95e46b35f0ccade5dea6dc
Merge: 8d51e9ee7aea4ee2e3183054941a743e28d2dbd0 c03928cfc7eb043859b975f4d51dfc5927da1455
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:07:33 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog                  |  8 ++++++++
 debian/control                    | 24 ++++++++++++------------
 debian/libkf5quickaddons5.symbols | 16 +++++++++-------
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --cc debian/changelog
index 155f463,0657d05..2e235cd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,11 +1,21 @@@
+ kdeclarative (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+   * Update symbols files.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 10:13:38 +0200
+ 
 +kdeclarative (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:02:52 +0200
 +
  kdeclarative (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).
diff --cc debian/control
index 9239317,ac21249..96e0c72
--- a/debian/control
+++ b/debian/control
@@@ -5,18 -5,18 +5,18 @@@ 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.10.0),
+                extra-cmake-modules (>= 5.11.0~),
+                kio-dev (>= 5.11.0~),
                 libepoxy-dev,
-                libkf5config-dev (>= 5.10.0),
-                libkf5globalaccel-dev (>= 5.10.0),
-                libkf5guiaddons-dev (>= 5.10.0),
-                libkf5i18n-dev (>= 5.10.0),
-                libkf5iconthemes-dev (>= 5.10.0),
+                libkf5config-dev (>= 5.11.0~),
+                libkf5globalaccel-dev (>= 5.11.0~),
+                libkf5guiaddons-dev (>= 5.11.0~),
+                libkf5i18n-dev (>= 5.11.0~),
+                libkf5iconthemes-dev (>= 5.11.0~),
 -               libkf5itemviews-dev (>= 5.7.0),
 +               libkf5itemviews-dev (>= 5.10.0),
-                libkf5package-dev (>= 5.10.0),
-                libkf5widgetsaddons-dev (>= 5.10.0),
-                libkf5windowsystem-dev (>= 5.10.0),
+                libkf5package-dev (>= 5.11.0~),
+                libkf5widgetsaddons-dev (>= 5.11.0~),
+                libkf5windowsystem-dev (>= 5.11.0~),
                 pkg-config,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4),

-- 
kdeclarative packaging