[SCM] kate packaging branch, master, updated. debian/4.13.1-2-6-g8441542

Maximiliano Curia maxy at moszumanska.debian.org
Fri Aug 1 07:48:01 UTC 2014


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

The following commit has been merged in the master branch:
commit 2ca002d785dab36d6e06b74628ea64685b9f01ff
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jul 31 21:17:40 2014 +0200

    Remove patch: debian-disable-tests.diff, test are run with autopkgtest.
---
 debian/changelog                         |  2 ++
 debian/patches/debian-disable-tests.diff | 21 ---------------------
 debian/patches/series                    |  1 -
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6691657..2e036dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 kate (4:4.13.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove patch: debian-disable-tests.diff, test are run with
+    autopkgtest.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 13:03:27 +0200
 
diff --git a/debian/patches/debian-disable-tests.diff b/debian/patches/debian-disable-tests.diff
deleted file mode 100644
index e494961..0000000
--- a/debian/patches/debian-disable-tests.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-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 0fcd044..11ed0cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-debian-disable-tests.diff
 sideeffects_in_asserts_are_evil.patch

-- 
kate packaging



More information about the pkg-kde-commits mailing list