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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit abfc39463092a86e72b35c905a2733dafc4935b1
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Jul 12 15:15:02 2015 +0200

    Import NMU 1:2.8.5+dfsg-1.1
---
 debian/changelog               |  8 ++++++++
 debian/control                 |  1 +
 debian/patches/libwps-0.4.diff | 35 +++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 4 files changed, 45 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ac736d8..28e110c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+calligra (1:2.8.5+dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * build against libwps 0.4.0 (closes: #788969)
+  * add missing libetonyek-dev build-dependency
+
+ -- Rene Engelhard <rene at debian.org>  Tue, 16 Jun 2015 23:10:07 +0200
+
 calligra (1:2.8.5+dfsg-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #744291, #748990)
diff --git a/debian/control b/debian/control
index f6f6a76..d46fb23 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: cmake (>= 2.8),
                libattica-dev,
                libboost-dev,
                libeigen3-dev (>= 2.0~beta6),
+               libetonyek-dev,
                libexiv2-dev (>= 0.16),
                libfftw3-dev,
                libfontconfig1-dev,
diff --git a/debian/patches/libwps-0.4.diff b/debian/patches/libwps-0.4.diff
new file mode 100644
index 0000000..b8d706c
--- /dev/null
+++ b/debian/patches/libwps-0.4.diff
@@ -0,0 +1,35 @@
+--- calligra-2.8.5+dfsg.orig/cmake/modules/FindLibWps.cmake
++++ calligra-2.8.5+dfsg/cmake/modules/FindLibWps.cmake
+@@ -10,16 +10,16 @@
+ 
+ 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}
+ )
+ 
+--- calligra-2.8.5+dfsg.orig/filters/words/works/import/WPSImport.cpp
++++ calligra-2.8.5+dfsg/filters/words/works/import/WPSImport.cpp
+@@ -43,7 +43,9 @@ private:
+     bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
+     {
+         libwps::WPSKind kind = libwps::WPS_TEXT;
+-        libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(input, kind);
++        libwps::WPSCreator creator;
++        bool needsEncoding = false;
++        libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(input, kind, creator, needsEncoding);
+         if ((libwps::WPS_TEXT != kind) || (confidence != libwps::WPS_CONFIDENCE_EXCELLENT))
+         {
+             fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid Microsoft Works document.
");
diff --git a/debian/patches/series b/debian/patches/series
index 86d9466..86686e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ switch-to-librevenge-based-import-libs.patch
 filter_registry_not_a_singleton
 channelFlags_logic_change
 do_not_install_removed_files
+libwps-0.4.diff

-- 
Calligra suite packaging