[SCM] kate packaging branch, master, updated. debian/4.13.1-1-6-ge4046cf

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kate.git;a=commitdiff;h=992a106

The following commit has been merged in the master branch:
commit 992a106be13cc8e0b0558deb3402aee0638d3283
Author: Pino Toscano <pino at debian.org>
Date:   Sat May 31 16:25:42 2014 +0200

    disable the build of tests
    
    they are not (and cannot be) run
---
 debian/changelog                         |  2 ++
 debian/patches/debian-disable-tests.diff | 21 +++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 63187a8..4ba6071 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ kate (4:4.13.1-2) UNRELEASED; urgency=medium
     it is already provided by kate-syntax-go (see #628161).
   * Remove the files we must not install for real, so this should help not
     installing them accidentally again.
+  * Disable the build of tests, since they are not (and cannot be) run;
+    patch debian-disable-tests.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 31 May 2014 15:18:33 +0200
 
diff --git a/debian/patches/debian-disable-tests.diff b/debian/patches/debian-disable-tests.diff
new file mode 100644
index 0000000..e494961
--- /dev/null
+++ b/debian/patches/debian-disable-tests.diff
@@ -0,0 +1,21 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Disable the tests during build
+ Revert the upstream forced KDE4_BUILD_TESTS to off, so tests are not built.
+ .
+ The tests cannot be run from the build directory as they are anyway,
+ since some require to be installed, and also with the other kde daemons
+ running.
+Forwarded: not-needed
+Last-Update: 2014-05-31
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,7 @@ endif(NOT APPLE)
+ configure_file (config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+ 
+ # enforce build of tests
+-set (KDE4_BUILD_TESTS "ON" CACHE "BOOL" "Enable building of tests" FORCE)
++set (KDE4_BUILD_TESTS "OFF" CACHE "BOOL" "Enable building of tests" FORCE)
+ 
+ # KDE/QT definitions we want
+ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
diff --git a/debian/patches/series b/debian/patches/series
index 11ed0cd..0fcd044 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+debian-disable-tests.diff
 sideeffects_in_asserts_are_evil.patch

-- 
kate packaging