[SCM] Calligra suite packaging branch, tip, updated. debian/2.4.3-2-368-g6843e2f

[Adrien Grellier]

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

The following commit has been merged in the tip branch:
commit 0c40942c6ed912dac10da80bff5a3bc7fb3a2b41
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Fri Nov 23 21:00:52 2012 +0100

    Added fix_WPG_filters_build.diff to fix detection of WPG libraries.
---
 debian/changelog                          |    1 +
 debian/patches/fix_WPG_filters_build.diff |   22 ++++++++++++++++++++++
 debian/patches/series                     |    1 +
 3 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc52dfa..c956cb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ calligra (1:2.5.91-1) UNRELEASED; urgency=low
   * New upstream release
     - Added build_videoshape_thumbnails_phononexperimental.diff to fix FTBFS
     - Removed do_not_link_blas.diff. Included upstream.
+    - Added fix_WPG_filters_build.diff to fix detection of WPG libraries.
 
  -- Adrien Grellier <adrien.grellier at laposte.net>  Tue, 21 Aug 2012 10:17:19 +0200
 
diff --git a/debian/patches/fix_WPG_filters_build.diff b/debian/patches/fix_WPG_filters_build.diff
new file mode 100644
index 0000000..dc63506
--- /dev/null
+++ b/debian/patches/fix_WPG_filters_build.diff
@@ -0,0 +1,22 @@
+commit d84ff4edbc48cbab1395d543fda5b1d5ca10570d
+Author: Yue Liu <yue.liu at mail.com>
+Date:   Sat Nov 17 17:11:12 2012 -0500
+
+    fix WPG detection, patch from Raúl Sánchez Siles <rasasi78 at gmail.com>
+
+diff --git a/filters/words/CMakeLists.txt b/filters/words/CMakeLists.txt
+index aebcfa1..0c2107c 100644
+--- a/filters/words/CMakeLists.txt
++++ b/filters/words/CMakeLists.txt
+@@ -57,9 +57,9 @@ IF( NOT TINY )
+     macro_log_feature(LIBWPS_FOUND "LibWPS" "Microsoft Works Document Library" "http://libwps.sourceforge.net/" FALSE "" "Required by the Words WPS import filter")
+ 
+     add_subdirectory( applixword )
+-    if(WPD_FOUND AND WPG_FOUND)
++    if(WPD_FOUND AND LIBWPG_FOUND)
+         add_subdirectory( wordperfect )
+-    endif(WPD_FOUND AND WPG_FOUND)
++    endif(WPD_FOUND AND LIBWPG_FOUND)
+     if(WPD_FOUND AND LIBWPS_FOUND)
+         add_subdirectory( works )
+     endif(WPD_FOUND AND LIBWPS_FOUND)
diff --git a/debian/patches/series b/debian/patches/series
index e73d526..185b9d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 build_videoshape_thumbnails_phononexperimental.diff
+fix_WPG_filters_build.diff

-- 
Calligra suite packaging