[SCM] Calligra suite packaging branch, tip, updated. ae0ce4dd7ac0cddf6dda5d961a3d8afb232d5b2d

[Adrien Grellier]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=6a6775f

The following commit has been merged in the tip branch:
commit 6a6775f38d63ad00453c249c6a75da63ae934735
Author: Pino Toscano <pino at debian.org>
Date:   Tue Mar 27 14:15:24 2012 +0200

    drop patch enable_calligraactive
    
    unneeded now, since calligra active is disabled with kdelibs < 4.8.0
---
 debian/patches/enable_calligraactive |   13 -------------
 debian/patches/series                |    1 -
 2 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/debian/patches/enable_calligraactive b/debian/patches/enable_calligraactive
deleted file mode 100644
index bd008a8..0000000
--- a/debian/patches/enable_calligraactive
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -96,10 +96,6 @@
-     set(SHOULD_BUILD_ACTIVE TRUE)
- ENDIF()
- 
--# HACK Active requires kdeclartive.h but the cmake test fails for olde kdelibs versions
--# diabling until it's fixed
--    set(SHOULD_BUILD_ACTIVE FALSE)
--
- if(KDE4_BUILD_TESTS)
-     # only with this definition will the FOO_TEST_EXPORT macro do something
-     add_definitions(-DCOMPILING_TESTS)
diff --git a/debian/patches/series b/debian/patches/series
index ceaf792..5f1be4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 do_not_link_blas
-enable_calligraactive

-- 
Calligra suite packaging