[SCM] KDE Base Runtime module packaging branch, master, updated. debian/16.04.2-2-3-gf27b8f4

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-runtime.git;a=commitdiff;h=f27b8f4

The following commit has been merged in the master branch:
commit f27b8f4e8a1fae6c5934a38b4617549304b671e1
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jul 31 15:41:58 2016 +0200

    update the patches
    
    - upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch:
      drop, backported
    - upstream_cmake-fix-add_definitions-according-to-new-policy.patch:
      drop, backported
---
 debian/changelog                                   |  5 +++
 debian/patches/series                              |  2 --
 ...x-add_definitions-according-to-new-policy.patch | 39 ----------------------
 ...in_req-to-match-kdelibs-policy-and-enable.patch | 21 ------------
 4 files changed, 5 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc07c2e..bfb4db5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ kde-runtime (4:16.04.3-0r1) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * New upstream release.
   * Remove the unused libqzeitgeist-dev build dependency.
+  * Update the patches:
+    - upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch:
+      drop, backported
+    - upstream_cmake-fix-add_definitions-according-to-new-policy.patch: drop,
+      backported
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 Jul 2016 15:37:23 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index a3209e3..eadb42f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
-upstream_cmake-fix-add_definitions-according-to-new-policy.patch
 disable_usr_lib_install_rpath.diff
 use_the_correct_locale.patch
 use_always_present_path_to_test.patch
diff --git a/debian/patches/upstream_cmake-fix-add_definitions-according-to-new-policy.patch b/debian/patches/upstream_cmake-fix-add_definitions-according-to-new-policy.patch
deleted file mode 100644
index ba78402..0000000
--- a/debian/patches/upstream_cmake-fix-add_definitions-according-to-new-policy.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 18 Jun 2016 10:25:22 +0200
-Subject: cmake: fix add_definitions according to new policy
-
----
- kioslave/nfs/CMakeLists.txt       | 2 +-
- kwalletd/autotests/CMakeLists.txt | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/kioslave/nfs/CMakeLists.txt b/kioslave/nfs/CMakeLists.txt
-index 32be86c..0d62d7b 100644
---- a/kioslave/nfs/CMakeLists.txt
-+++ b/kioslave/nfs/CMakeLists.txt
-@@ -23,7 +23,7 @@ if (HAVE_XDR_U_LONGLONG_T)
-     add_definitions(-DHAVE_XDR_U_LONGLONG_T)
- endif (HAVE_XDR_U_LONGLONG_T)
- 
-- add_definitions(-DTRANSLATION_DOMAIN=\"kio_nfs\")
-+ add_definitions(-DTRANSLATION_DOMAIN="kio_nfs")
- 
- set(kio_nfs_PART_SRCS kio_nfs.cpp nfsv2.cpp nfsv3.cpp rpc_nfs3_prot_xdr.c rpc_nfs2_prot_xdr.c )
- 
-diff --git a/kwalletd/autotests/CMakeLists.txt b/kwalletd/autotests/CMakeLists.txt
-index 5ffbba4..c9af385 100644
---- a/kwalletd/autotests/CMakeLists.txt
-+++ b/kwalletd/autotests/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_definitions(-DTEST_DATA="\\"${CMAKE_CURRENT_SOURCE_DIR}/\\"")
-+add_definitions(-DTEST_DATA="${CMAKE_CURRENT_SOURCE_DIR}/")
- 
- set(testname testpamopen)
- include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
-@@ -8,4 +8,4 @@ target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT
- set(testname testpamopennofile)
- include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
- kde4_add_unit_test(${testname} kwalletexecuter.cpp ${testname}.cpp)
--target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBS})
-\ No newline at end of file
-+target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBS})
diff --git a/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch b/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
deleted file mode 100644
index 0187e87..0000000
--- a/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 18 Jun 2016 09:46:45 +0200
-Subject: set cmake_min_req to match kdelibs policy and enable newer cmake
- policies
-
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1db0cd2..8b4d0f2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,7 @@
- project(KDEBASE_RUNTIME)
- 
-+cmake_minimum_required(VERSION 2.8.9)
-+
- # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
- 

-- 
KDE Base Runtime module packaging