[SCM] kio packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-17-gb4a5ef1

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit b4a5ef13783c225d4f09c5f4f1aa995840a2f86d
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Jun 23 13:16:09 2015 +0200

    Remove ktcpsockettest in kubuntu_failing-tests.diff to fix build
---
 debian/changelog                          |  6 ++++++
 debian/patches/kubuntu_failing-tests.diff | 12 ++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ecf5cb5..dc5f2bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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
diff --git a/debian/patches/kubuntu_failing-tests.diff b/debian/patches/kubuntu_failing-tests.diff
index ac5ca23..02d3212 100644
--- a/debian/patches/kubuntu_failing-tests.diff
+++ b/debian/patches/kubuntu_failing-tests.diff
@@ -9,7 +9,15 @@ Index: kio-5.11.0/autotests/CMakeLists.txt
 ===================================================================
 --- kio-5.11.0.orig/autotests/CMakeLists.txt
 +++ kio-5.11.0/autotests/CMakeLists.txt
-@@ -55,7 +55,6 @@ ecm_add_tests(
+@@ -24,7 +24,6 @@ ecm_add_tests(
+  jobremotetest.cpp
+  kfileitemtest.cpp
+  kprotocolinfotest.cpp
+- ktcpsockettest.cpp
+  globaltest.cpp
+  mkpathjobtest.cpp
+  threadtest.cpp
+@@ -55,7 +54,6 @@ ecm_add_tests(
   kdirmodeltest.cpp
   kfileitemactionstest.cpp
   fileundomanagertest.cpp
@@ -17,7 +25,7 @@ Index: kio-5.11.0/autotests/CMakeLists.txt
   kurlcompletiontest.cpp
   kurlrequestertest.cpp
   jobguitest.cpp
-@@ -87,7 +86,6 @@ ecm_add_tests(
+@@ -87,7 +85,6 @@ ecm_add_tests(
   kdiroperatortest.cpp
   knewfilemenutest.cpp
   kfilecopytomenutest.cpp

-- 
kio packaging