[SCM] kio packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-13-gadbca81

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit adbca81edca6d7ae9c98dd368573fcfd85599a21
Merge: b4a5ef13783c225d4f09c5f4f1aa995840a2f86d 1047a0aa61408ba7e3b1f77f55ff05c2cc6c0ac7
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:58:55 2015 +0200

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

 debian/changelog     |  8 ++++++++
 debian/control       | 56 ++++++++++++++++++++++++++--------------------------
 debian/not-installed | 11 +++--------
 3 files changed, 39 insertions(+), 36 deletions(-)

diff --cc debian/changelog
index dc5f2bd,f0d0a4b..9893e32
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,11 +1,42 @@@
+ kio (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * Update symbols files.
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 09:42:03 +0200
+ 
 +kio (5.11.0-0ubuntu2) wily; urgency=medium
 +
 +  * Remove ktcpsockettest in kubuntu_failing-tests.diff to fix build
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 23 Jun 2015 13:14:32 +0200
 +
 +kio (5.11.0-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release, uploaded to pass failing tests
 +  * Add kubuntu_build-with-kf5.10.diff
 +  * Add kubuntu_failing-tests.diff to skip the remaining fails
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 22 Jun 2015 21:37:16 +0200
 +
 +kio (5.10.0-0ubuntu2) wily; urgency=medium
 +
 +  * Rebuild due to test server failures
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 22 Jun 2015 12:49:20 +0200
 +
 +kio (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +  * Update symbols files.
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:51:46 +0200
 +
  kio (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).
diff --cc debian/control
index 1945903,acb8a39..6b36cf0
--- a/debian/control
+++ b/debian/control
@@@ -5,29 -5,29 +5,29 @@@ 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),
-                kdoctools-dev (>= 5.10.0),
+                extra-cmake-modules (>= 5.11.0~),
+                kdoctools-dev (>= 5.11.0~),
                 libacl1-dev,
-                libkf5archive-dev (>= 5.10.0),
-                libkf5bookmarks-dev (>= 5.10.0),
+                libkf5archive-dev (>= 5.11.0~),
+                libkf5bookmarks-dev (>= 5.11.0~),
 -               libkf5codecs-dev (>= 5.7.0),
 +               libkf5codecs-dev (>= 5.10.0),
-                libkf5completion-dev (>= 5.10.0),
-                libkf5config-dev (>= 5.10.0),
-                libkf5configwidgets-dev (>= 5.10.0),
-                libkf5coreaddons-dev (>= 5.10.0),
-                libkf5dbusaddons-dev (>= 5.10.0),
-                libkf5i18n-dev (>= 5.10.0),
-                libkf5iconthemes-dev (>= 5.10.0),
-                libkf5itemviews-dev (>= 5.10.0),
-                libkf5jobwidgets-dev (>= 5.10.0),
-                libkf5notifications-dev (>= 5.10.0),
-                libkf5service-dev (>= 5.10.0),
-                libkf5solid-dev (>= 5.10.0),
-                libkf5textwidgets-dev (>= 5.10.0),
-                libkf5wallet-dev (>= 5.10.0),
-                libkf5widgetsaddons-dev (>= 5.10.0),
-                libkf5windowsystem-dev (>= 5.10.0),
-                libkf5xmlgui-dev (>= 5.10.0),
+                libkf5completion-dev (>= 5.11.0~),
+                libkf5config-dev (>= 5.11.0~),
+                libkf5configwidgets-dev (>= 5.11.0~),
+                libkf5coreaddons-dev (>= 5.11.0~),
+                libkf5dbusaddons-dev (>= 5.11.0~),
+                libkf5i18n-dev (>= 5.11.0~),
+                libkf5iconthemes-dev (>= 5.11.0~),
+                libkf5itemviews-dev (>= 5.11.0~),
+                libkf5jobwidgets-dev (>= 5.11.0~),
+                libkf5notifications-dev (>= 5.11.0~),
+                libkf5service-dev (>= 5.11.0~),
+                libkf5solid-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~),
                 libkrb5-dev,
                 libqt5x11extras5-dev (>= 5.4),
                 libxml2-dev,

-- 
kio packaging