[SCM] kdeclarative packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-9-g9f09491

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 9f0949193e28a59d80d08e35e71d9068d6461675
Merge: 6de3935c266042f4ac6c9a483be68df7e66da34b 2bbf101c77a0d80437ed2a6d89ca4c8267dec159
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 12:28:14 2015 -0700

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

 debian/changelog                                 |  9 +++++++++
 debian/control                                   | 24 ++++++++++++------------
 debian/libkf5quickaddons5.symbols                | 16 +++++++++-------
 debian/qml-module-org-kde-kquickcontrols.install |  1 +
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --cc debian/changelog
index 86e2152,064d29e..4f34ed6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,18 @@@
 -kdeclarative (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +kdeclarative (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
  
 -  * Vivid backport
 -  * Add missing file. 
 +  * New upstream release
++  * Fix merge, remove unused broken backport.
  
 - -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:11:44 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:02:52 -0700
  
+ 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 ]
diff --cc debian/control
index 5aa7f8b,96e0c72..2b97883
--- 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.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               kio-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               kio-dev (>= 5.12.0~),
                 libepoxy-dev,
 -               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.10.0),
 -               libkf5package-dev (>= 5.11.0~),
 -               libkf5widgetsaddons-dev (>= 5.11.0~),
 -               libkf5windowsystem-dev (>= 5.11.0~),
 +               libkf5config-dev (>= 5.12.0),
-                libkf5globalaccel-dev (>= 5.12.0),
-                libkf5guiaddons-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5iconthemes-dev (>= 5.12.0),
-                libkf5itemviews-dev (>= 5.12.0),
-                libkf5package-dev (>= 5.12.0),
-                libkf5widgetsaddons-dev (>= 5.12.0),
-                libkf5windowsystem-dev (>= 5.12.0),
++               libkf5globalaccel-dev (>= 5.12.0~),
++               libkf5guiaddons-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5iconthemes-dev (>= 5.12.0~),
++               libkf5itemviews-dev (>= 5.12.0~),
++               libkf5package-dev (>= 5.12.0~),
++               libkf5widgetsaddons-dev (>= 5.12.0~),
++               libkf5windowsystem-dev (>= 5.12.0~),
                 pkg-config,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4),
@@@ -37,9 -37,9 +37,9 @@@ Description: commandline tool for launc
  Package: libkf5declarative-dev
  Section: libdevel
  Architecture: any
- Depends: kio-dev (>= 5.12.0),
 -Depends: kio-dev (>= 5.11.0~),
++Depends: kio-dev (>= 5.12.0~),
           libkf5declarative5 (= ${binary:Version}),
-          libkf5package-dev (>= 5.12.0),
 -         libkf5package-dev (>= 5.11.0~),
++         libkf5package-dev (>= 5.12.0~),
           libkf5quickaddons5 (= ${binary:Version}),
           qtbase5-dev (>= 5.4),
           qtdeclarative5-dev (>= 5.4),

-- 
kdeclarative packaging