[SCM] kio packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-14-g0876677

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 087667712e3f54a6fa6b7be376c694c9ccfe0cea
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 12:38:14 2015 +0200

    patch--
---
 debian/patches/kubuntu_build-with-kf5.10.diff | 32 ---------------------------
 debian/patches/series                         |  1 -
 2 files changed, 33 deletions(-)

diff --git a/debian/patches/kubuntu_build-with-kf5.10.diff b/debian/patches/kubuntu_build-with-kf5.10.diff
deleted file mode 100644
index 7b26b20..0000000
--- a/debian/patches/kubuntu_build-with-kf5.10.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: build with kf 5.10
- this upload of kio is just to fix some failing tests, remove this patch once
- the rest of kf 5.11 is up
-Author: Jonathan Riddell
-Forwarded: no
-Last-Update: 2015-06-22
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: kio-5.11.0/CMakeLists.txt
-===================================================================
---- kio-5.11.0.orig/CMakeLists.txt
-+++ kio-5.11.0/CMakeLists.txt
-@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12)
- project(KIO)
- 
- include(FeatureSummary)
--find_package(ECM 5.11.0  NO_MODULE)
-+find_package(ECM 5.10.0  NO_MODULE)
- set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
- feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 
-@@ -22,8 +22,8 @@ include(ECMSetupVersion)
- include(ECMGenerateHeaders)
- include(ECMMarkNonGuiExecutable)
- 
--set(KF5_VERSION "5.11.0") # handled by release scripts
--set(KF5_DEP_VERSION "5.11.0") # handled by release scripts
-+set(KF5_VERSION "5.10.0") # handled by release scripts
-+set(KF5_DEP_VERSION "5.10.0") # handled by release scripts
- 
- ecm_setup_version(
-   ${KF5_VERSION}
diff --git a/debian/patches/series b/debian/patches/series
index d1288d7..1e4a97c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ return_on_ACCESS_DENIED
 report_error_removing_dirs
 wait_for_a_bit_longer
 kubuntu_kdelibs4-docs-path.diff
-kubuntu_build-with-kf5.10.diff

-- 
kio packaging