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

[Dmitry Smirnov]

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

The following commit has been merged in the master branch:
commit 322727e81571eb070385d343233e25ace0dabea3
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sat Sep 19 15:30:53 2015 +1000

    no-planconvert-jar.patch
---
 debian/patches/no-planconvert-jar.patch | 14 ++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 15 insertions(+)

diff --git a/debian/patches/no-planconvert-jar.patch b/debian/patches/no-planconvert-jar.patch
new file mode 100644
index 0000000..9ea288f
--- /dev/null
+++ b/debian/patches/no-planconvert-jar.patch
@@ -0,0 +1,14 @@
+Last-Update: 2015-09-19
+Forwarded: not-needed
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: do not install pre-build .JAR dropped from +DFSG tarball (prevents FTBFS).
+
+--- a/filters/plan/mpxj/planconvert/CMakeLists.txt
++++ b/filters/plan/mpxj/planconvert/CMakeLists.txt
+@@ -6,5 +6,5 @@
+   "${CMAKE_BINARY_DIR}/filters/plan/mpxj/planconvert/mpxjconfig.h"
+ )
+ 
+ 
+-install(FILES jar/PlanConvert.jar  DESTINATION ${PLANCONVERT_INSTALL_DIR})
++#install(FILES jar/PlanConvert.jar  DESTINATION ${PLANCONVERT_INSTALL_DIR})
diff --git a/debian/patches/series b/debian/patches/series
index a4de4a3..fc23df6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@ cmake-xbase64.patch
 filter_registry_not_a_singleton.patch
 imports_search_path.patch
 libwps-0.4.patch
+no-planconvert-jar.patch
 #channelFlags_logic_change.patch
 #cmake-do_not_install_removed_files.patch
 ##tests-disable_convolution_failling_tests.patch

-- 
Calligra suite packaging