[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-27-g3c36ee0

[Dmitry Smirnov]

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

The following commit has been merged in the master branch:
commit f38a1be5cb37fa2a3dc14a9e62e9b6b3708c82c2
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Wed Jun 17 09:40:25 2015 +1000

    transition to libwps-0.4 (Closes: #788969)
    
     Thanks, Rene Engelhard.
---
 debian/changelog                |  3 +++
 debian/control                  |  2 +-
 debian/patches/libwps-0.4.patch | 46 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 4 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d968dbe..58e4247 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,10 +11,13 @@ calligra (1:2.9.5+dfsg-1) UNRELEASED; urgency=low
     - kisjpegtest_call_kisexiv2_initialize
     - switch-to-librevenge-based-import-libs.patch
     - upstream_review_120609_pixmapcachesheetview_crash
+    + libwps-0.4.patch (Closes: #788969)
     * patches refreshed, sorted and renamed consistently ending with ".patch".
   * Build-Depends:
     + libboost-system-dev
     + postgresql-server-dev-9.4
+    - libwps-dev (>= 0.3)
+    + libwps-dev (>= 0.4)
   * calligra-libs.install:
     + liblibglobal.so.1*
     + liblibkispsd.so.1*
diff --git a/debian/control b/debian/control
index 4950103..27b2aed 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,7 @@ Build-Depends: cmake (>= 2.8),
                libvisio-dev (>= 0.1),
                libwpd-dev (>= 0.10),
                libwpg-dev (>= 0.3),
-               libwps-dev (>= 0.3),
+               libwps-dev (>= 0.4),
                libxbase64-dev,
                libxi-dev,
                nepomuk-core-dev,
diff --git a/debian/patches/libwps-0.4.patch b/debian/patches/libwps-0.4.patch
new file mode 100644
index 0000000..79595d9
--- /dev/null
+++ b/debian/patches/libwps-0.4.patch
@@ -0,0 +1,46 @@
+Last-Update: 2015-06-17
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788969
+Origin: http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?id=124c28df44584e08b00d4dbb859362af73c41070
+From: David Tardon <dtardon at redhat.com>
+Description: adapt to libwps 0.4
+
+--- a/cmake/modules/FindLibWps.cmake
++++ b/cmake/modules/FindLibWps.cmake
+@@ -9,18 +9,18 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ 
+ include(LibFindMacros)
+ libfind_package(LIBWPS LibWpd)
+-libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3)
++libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.4)
+ 
+ find_path(LIBWPS_INCLUDE_DIR
+     NAMES libwps/libwps.h
+     HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR}
+-    PATH_SUFFIXES libwps-0.3
++    PATH_SUFFIXES libwps-0.4
+ )
+ 
+ find_library(LIBWPS_LIBRARY
+-    NAMES wps wps-0.3
++    NAMES wps wps-0.4
+     HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
+ )
+ 
+ set(LIBWPS_PROCESS_LIBS LIBWPS_LIBRARY LIBWPD_LIBRARIES)
+--- a/filters/words/works/import/WPSImport.cpp
++++ b/filters/words/works/import/WPSImport.cpp
+@@ -90,9 +90,11 @@
+     }
+     bool isSupportedFormat(librevenge::RVNGInputStream &input)
+     {
+         WPSKind kind = WPS_TEXT;
+-        WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind);
++        WPSCreator creator = WPS_MSWORKS;
++        bool needsEncoding = false;
++        WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind, creator, needsEncoding);
+         if (confidence == WPS_CONFIDENCE_NONE || kind != WPS_TEXT)
+             return false;
+         return true;
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 223dfd0..a4de4a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ cmake-set_kritasketch_lib_soversion.patch
 cmake-xbase64.patch
 filter_registry_not_a_singleton.patch
 imports_search_path.patch
+libwps-0.4.patch
 #channelFlags_logic_change.patch
 #cmake-do_not_install_removed_files.patch
 ##tests-disable_convolution_failling_tests.patch

-- 
Calligra suite packaging