[SCM] KDE Base Runtime module packaging branch, master, updated. debian/16.04.0-1-13-g25ee75a

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 25ee75afa9bb68ddd28f3262f6718972f29906b3
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 18 11:54:06 2016 +0200

    update patch order, and refresh
---
 debian/patches/disable_kwalletd_autotests | 3 +--
 debian/patches/series                     | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/patches/disable_kwalletd_autotests b/debian/patches/disable_kwalletd_autotests
index 3eb71f1..30adbda 100644
--- a/debian/patches/disable_kwalletd_autotests
+++ b/debian/patches/disable_kwalletd_autotests
@@ -1,7 +1,7 @@
 --- a/kwalletd/autotests/CMakeLists.txt
 +++ b/kwalletd/autotests/CMakeLists.txt
 @@ -1,11 +1,11 @@
- 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})
@@ -16,7 +16,6 @@
 -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
 +# set(testname testpamopennofile)
 +# include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
 +# kde4_add_unit_test(${testname} kwalletexecuter.cpp ${testname}.cpp)
diff --git a/debian/patches/series b/debian/patches/series
index b1a3022..70bba3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
-hurd.diff
+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
@@ -9,5 +10,4 @@ kubuntu_shutup_shutup_shutup.diff
 kubuntu_drkonqi_whoopsie_integration.patch
 kubuntu_disable-gpg-backend.diff
 add_glib_for_nm
-upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
-upstream_cmake-fix-add_definitions-according-to-new-policy.patch
+hurd.diff

-- 
KDE Base Runtime module packaging