[SCM] Calligra suite packaging branch, master, updated. f4d3f6cd9cf6a6ed0b9fb29406e54460d86375fc

[Raúl Sánchez Siles]

The following commit has been merged in the master branch:
commit f4d3f6cd9cf6a6ed0b9fb29406e54460d86375fc
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Mon Feb 6 22:25:24 2012 +0100

    Update to upstream 2.3.87(Beta 7).
    Reverts upstream hack disabling calligraactive build since debian already complies
    with kdelibs>=4.7 requirement
---
 debian/changelog                     |    4 ++--
 debian/kexi.install                  |    1 +
 debian/patches/enable_calligraactive |   13 +++++++++++++
 debian/patches/series                |    1 +
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5dffc7c..a190400 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-calligra (1:2.3.86-0r1) UNRELEASED; urgency=low
+calligra (1:2.3.87-0r1) UNRELEASED; urgency=low
 
   * Initial release.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 16 Dec 2011 23:22:59 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 03 Feb 2012 08:44:10 +0100
diff --git a/debian/kexi.install b/debian/kexi.install
index 674748e..213f566 100644
--- a/debian/kexi.install
+++ b/debian/kexi.install
@@ -54,3 +54,4 @@ usr/share/kde4/servicetypes/kexidb_driver.desktop
 usr/share/kde4/servicetypes/kexihandler.desktop
 usr/share/kde4/servicetypes/keximigration_driver.desktop
 usr/share/kde4/servicetypes/widgetfactory.desktop
+usr/share/doc/kde/HTML/en/kexi
diff --git a/debian/patches/enable_calligraactive b/debian/patches/enable_calligraactive
new file mode 100644
index 0000000..bd008a8
--- /dev/null
+++ b/debian/patches/enable_calligraactive
@@ -0,0 +1,13 @@
+--- 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 5f1be4d..ceaf792 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 do_not_link_blas
+enable_calligraactive

-- 
Calligra suite packaging