[SCM] Calligra suite packaging branch, master, updated. debian/2.7.5-1-71-g2366c72
Maximiliano Curia
maxy at moszumanska.debian.org
Fri May 16 15:01:59 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=2821552
The following commit has been merged in the master branch:
commit 28215525b839c4baa0ac683d5677048f29c61526
Author: Maximiliano Curia <maxy at debian.org>
Date: Thu May 15 17:25:29 2014 +0200
Refresh patches for 2.8.3.
---
debian/changelog | 1 +
debian/patches/add_keywords_to_desktop_files.patch | 72 +++++++++++-----------
debian/patches/calligra_imports_search_path | 18 +++---
debian/patches/eigen3.patch | 52 ++++++++--------
debian/patches/temporarily_disable_failing_tests | 14 ++---
5 files changed, 79 insertions(+), 78 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 226be25..ef3d22d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ calligra (1:2.8.3-1) UNRELEASED; urgency=medium
* New patch: set_kritasketch_lib_soversion
* New patch: install_images_in_datadir
* Bump libkdcraw and marble b-d, to help the kde4.12 transition.
+ * Refresh patches for 2.8.3.
-- Maximiliano Curia <maxy at debian.org> Thu, 15 May 2014 17:21:04 +0200
diff --git a/debian/patches/add_keywords_to_desktop_files.patch b/debian/patches/add_keywords_to_desktop_files.patch
index 7fd0c2b..b5779ac 100644
--- a/debian/patches/add_keywords_to_desktop_files.patch
+++ b/debian/patches/add_keywords_to_desktop_files.patch
@@ -1,107 +1,107 @@
Index: calligra/kexi/kexi.desktop
===================================================================
---- calligra.orig/kexi/kexi.desktop 2014-03-04 17:45:02.760217957 +0100
-+++ calligra/kexi/kexi.desktop 2014-03-04 17:45:02.756217861 +0100
-@@ -172,3 +172,4 @@
+--- calligra.orig/kexi/kexi.desktop 2014-05-15 17:22:11.679928774 +0200
++++ calligra/kexi/kexi.desktop 2014-05-15 17:22:11.675928933 +0200
+@@ -175,3 +175,4 @@
X-KDE-NativeMimeType=application/x-kexiproject-sqlite
X-KDE-NOTKoDocumentEmbeddable=true
Categories=Qt;KDE;Office;
+Keywords=Database;SQL;Access
Index: calligra/stage/app/stage.desktop
===================================================================
---- calligra.orig/stage/app/stage.desktop 2014-03-04 17:45:02.760217957 +0100
-+++ calligra/stage/app/stage.desktop 2014-03-04 17:45:02.756217861 +0100
-@@ -130,3 +130,4 @@
+--- calligra.orig/stage/app/stage.desktop 2014-05-15 17:22:11.679928774 +0200
++++ calligra/stage/app/stage.desktop 2014-05-15 17:22:11.675928933 +0200
+@@ -132,3 +132,4 @@
X-DocPath=stage/index.html
X-KDE-StartupNotify=true
Categories=Qt;KDE;Office;
+Keywords=Slideshow;Slides;Presentation;PowerPoint;odp;ppt;pptx
Index: calligra/active/calligraactive.desktop
===================================================================
---- calligra.orig/active/calligraactive.desktop 2014-03-04 17:45:02.760217957 +0100
-+++ calligra/active/calligraactive.desktop 2014-03-04 17:45:02.756217861 +0100
-@@ -41,3 +41,4 @@
+--- calligra.orig/active/calligraactive.desktop 2014-05-15 17:22:11.679928774 +0200
++++ calligra/active/calligraactive.desktop 2014-05-15 17:22:11.675928933 +0200
+@@ -43,3 +43,4 @@
#The right solution would be to make it possible to build libs without building the apps
InitialPreference=4
Categories=Qt;KDE;Office;
+Keywords=tablet;mobile;Plasma Active;touch
Index: calligra/words/part/author/author.desktop
===================================================================
---- calligra.orig/words/part/author/author.desktop 2014-03-04 17:45:02.760217957 +0100
-+++ calligra/words/part/author/author.desktop 2014-03-04 17:45:02.756217861 +0100
-@@ -98,3 +98,4 @@
+--- calligra.orig/words/part/author/author.desktop 2014-05-15 17:22:11.679928774 +0200
++++ calligra/words/part/author/author.desktop 2014-05-15 17:22:11.675928933 +0200
+@@ -101,3 +101,4 @@
X-DBUS-ServiceName=org.calligra.author
Categories=Qt;KDE;Office;
InitialPreference=3
+Keywords=Word;book;ebook;epub
Index: calligra/flow/part/flow.desktop
===================================================================
---- calligra.orig/flow/part/flow.desktop 2014-03-04 17:45:02.760217957 +0100
-+++ calligra/flow/part/flow.desktop 2014-03-04 17:45:02.756217861 +0100
-@@ -103,3 +103,4 @@
+--- calligra.orig/flow/part/flow.desktop 2014-05-15 17:22:11.679928774 +0200
++++ calligra/flow/part/flow.desktop 2014-05-15 17:22:11.675928933 +0200
+@@ -104,3 +104,4 @@
X-DBUS-StartupType=Multi
X-DBUS-ServiceName=org.calligra.flow
Categories=Qt;KDE;Office;
+Keywords=Diagram;flowchart;chart
Index: calligra/braindump/data/braindump.desktop
===================================================================
---- calligra.orig/braindump/data/braindump.desktop 2014-03-04 17:45:02.760217957 +0100
-+++ calligra/braindump/data/braindump.desktop 2014-03-04 17:45:02.756217861 +0100
-@@ -80,3 +80,4 @@
+--- calligra.orig/braindump/data/braindump.desktop 2014-05-15 17:22:11.679928774 +0200
++++ calligra/braindump/data/braindump.desktop 2014-05-15 17:22:11.675928933 +0200
+@@ -82,3 +82,4 @@
X-KDE-NativeMimeType=application/vnd.oasis.opendocument.graphics
X-KDE-SubstituteUID=false
X-KDE-Username=
+Keywords=Organize;whiteboard;brainstorming
Index: calligra/sheets/sheets.desktop
===================================================================
---- calligra.orig/sheets/sheets.desktop 2014-03-04 17:45:02.760217957 +0100
-+++ calligra/sheets/sheets.desktop 2014-03-04 17:45:02.756217861 +0100
-@@ -124,3 +124,4 @@
+--- calligra.orig/sheets/sheets.desktop 2014-05-15 17:22:11.679928774 +0200
++++ calligra/sheets/sheets.desktop 2014-05-15 17:22:11.675928933 +0200
+@@ -126,3 +126,4 @@
X-DocPath=sheets/index.html
X-KDE-StartupNotify=true
Categories=Qt;KDE;Office;
+Keywords=Spreadsheet;Excel;Calc;xls;xlsx;ods
Index: calligra/krita/krita.desktop
===================================================================
---- calligra.orig/krita/krita.desktop 2014-03-04 17:45:02.760217957 +0100
-+++ calligra/krita/krita.desktop 2014-03-04 17:45:02.756217861 +0100
-@@ -130,3 +130,4 @@
+--- calligra.orig/krita/krita.desktop 2014-05-15 17:22:11.679928774 +0200
++++ calligra/krita/krita.desktop 2014-05-15 17:22:11.675928933 +0200
+@@ -131,3 +131,4 @@
X-DBUS-StartupType=Multi
X-DBUS-ServiceName=org.krita.krita
X-Krita-Version=28
+Keywords=Photo;Photoshop;Paint;art;sketch
Index: calligra/karbon/data/karbon.desktop
===================================================================
---- calligra.orig/karbon/data/karbon.desktop 2014-03-04 17:45:02.760217957 +0100
-+++ calligra/karbon/data/karbon.desktop 2014-03-04 17:45:02.756217861 +0100
-@@ -144,3 +144,4 @@
+--- calligra.orig/karbon/data/karbon.desktop 2014-05-15 17:22:11.679928774 +0200
++++ calligra/karbon/data/karbon.desktop 2014-05-15 17:22:11.675928933 +0200
+@@ -148,3 +148,4 @@
Comment[zh_CN]=创建可缩放矢量绘图
Comment[zh_TW]=建立可調整向量圖
X-DocPath=http://userbase.kde.org/Special:MyLanguage/Karbon
+Keywords=Vector;Illustration;graphics
Index: calligra/words/app/words.desktop
===================================================================
---- calligra.orig/words/app/words.desktop 2014-03-04 17:45:02.760217957 +0100
-+++ calligra/words/app/words.desktop 2014-03-04 17:45:02.756217861 +0100
-@@ -134,3 +134,4 @@
+--- calligra.orig/words/app/words.desktop 2014-05-15 17:22:11.679928774 +0200
++++ calligra/words/app/words.desktop 2014-05-15 17:22:11.675928933 +0200
+@@ -137,3 +137,4 @@
X-DBUS-ServiceName=org.calligra.words
Categories=Qt;KDE;Office;
InitialPreference=4
+Keywords=Text;Word;odt;doc;docx
Index: calligra/plan/plan.desktop
===================================================================
---- calligra.orig/plan/plan.desktop 2014-03-04 17:45:02.760217957 +0100
-+++ calligra/plan/plan.desktop 2014-03-04 17:45:02.756217861 +0100
-@@ -102,3 +102,4 @@
+--- calligra.orig/plan/plan.desktop 2014-05-15 17:22:11.679928774 +0200
++++ calligra/plan/plan.desktop 2014-05-15 17:22:11.675928933 +0200
+@@ -104,3 +104,4 @@
X-DocPath=http://userbase.kde.org/Plan/Manual
Categories=Qt;KDE;Office;
X-KDE-StartupNotify=true
+Keywords=Organization;Project;Gantt;Management;
Index: calligra/plan/workpackage/planwork.desktop
===================================================================
---- calligra.orig/plan/workpackage/planwork.desktop 2014-03-04 17:45:02.760217957 +0100
-+++ calligra/plan/workpackage/planwork.desktop 2014-03-04 17:45:02.756217861 +0100
-@@ -96,3 +96,4 @@
+--- calligra.orig/plan/workpackage/planwork.desktop 2014-05-15 17:22:11.679928774 +0200
++++ calligra/plan/workpackage/planwork.desktop 2014-05-15 17:22:11.675928933 +0200
+@@ -97,3 +97,4 @@
Categories=Qt;KDE;Office;
X-KDE-StartupNotify=true
X-DocPath=http://userbase.kde.org/PlanWork/Manual
diff --git a/debian/patches/calligra_imports_search_path b/debian/patches/calligra_imports_search_path
index 8a4c77b..7d6f24d 100644
--- a/debian/patches/calligra_imports_search_path
+++ b/debian/patches/calligra_imports_search_path
@@ -1,7 +1,7 @@
Index: calligra/krita/gemini/MainWindow.cpp
===================================================================
---- calligra.orig/krita/gemini/MainWindow.cpp 2014-03-11 16:39:05.601183949 +0100
-+++ calligra/krita/gemini/MainWindow.cpp 2014-03-11 16:39:05.569183174 +0100
+--- calligra.orig/krita/gemini/MainWindow.cpp 2014-05-15 17:22:40.814772549 +0200
++++ calligra/krita/gemini/MainWindow.cpp 2014-05-15 17:22:40.810772707 +0200
@@ -158,6 +158,11 @@
sketchView->engine()->addImportPath(appdir.canonicalPath() + "/lib64/calligra/imports");
QString mainqml = appdir.canonicalPath() + "/share/apps/kritagemini/kritagemini.qml";
@@ -16,9 +16,9 @@ Index: calligra/krita/gemini/MainWindow.cpp
#endif
Index: calligra/krita/sketch/CMakeLists.txt
===================================================================
---- calligra.orig/krita/sketch/CMakeLists.txt 2014-03-11 16:39:05.601183949 +0100
-+++ calligra/krita/sketch/CMakeLists.txt 2014-03-11 16:39:05.581183465 +0100
-@@ -126,6 +126,9 @@
+--- calligra.orig/krita/sketch/CMakeLists.txt 2014-05-15 17:22:40.814772549 +0200
++++ calligra/krita/sketch/CMakeLists.txt 2014-05-15 17:22:40.810772707 +0200
+@@ -131,6 +131,9 @@
kde4_add_executable(kritasketch ${kritasketch_SRCS})
@@ -30,8 +30,8 @@ Index: calligra/krita/sketch/CMakeLists.txt
${QT_QTGUI_LIBRARIES}
Index: calligra/krita/sketch/MainWindow.cpp
===================================================================
---- calligra.orig/krita/sketch/MainWindow.cpp 2014-03-11 16:39:05.601183949 +0100
-+++ calligra/krita/sketch/MainWindow.cpp 2014-03-11 16:39:27.009702862 +0100
+--- calligra.orig/krita/sketch/MainWindow.cpp 2014-05-15 17:22:40.814772549 +0200
++++ calligra/krita/sketch/MainWindow.cpp 2014-05-15 17:22:40.810772707 +0200
@@ -114,6 +114,11 @@
view->engine()->addImportPath(appdir.canonicalPath() + "/lib64/calligra/imports");
QString mainqml = appdir.canonicalPath() + "/share/apps/kritasketch/kritasketch.qml";
@@ -46,8 +46,8 @@ Index: calligra/krita/sketch/MainWindow.cpp
#endif
Index: calligra/krita/gemini/CMakeLists.txt
===================================================================
---- calligra.orig/krita/gemini/CMakeLists.txt 2014-03-11 16:39:05.601183949 +0100
-+++ calligra/krita/gemini/CMakeLists.txt 2014-03-11 16:39:05.601183949 +0100
+--- calligra.orig/krita/gemini/CMakeLists.txt 2014-05-15 17:22:40.814772549 +0200
++++ calligra/krita/gemini/CMakeLists.txt 2014-05-15 17:22:40.810772707 +0200
@@ -31,6 +31,9 @@
kde4_add_executable(kritagemini ${kritagemini_SRCS})
diff --git a/debian/patches/eigen3.patch b/debian/patches/eigen3.patch
index 97d13b7..e873d1a 100644
--- a/debian/patches/eigen3.patch
+++ b/debian/patches/eigen3.patch
@@ -5,8 +5,8 @@ Last-Update: 2013-10-17
Index: calligra/CMakeLists.txt
===================================================================
---- calligra.orig/CMakeLists.txt 2014-03-04 17:45:14.208492319 +0100
-+++ calligra/CMakeLists.txt 2014-03-04 17:45:14.204492224 +0100
+--- calligra.orig/CMakeLists.txt 2014-05-15 17:22:23.135474153 +0200
++++ calligra/CMakeLists.txt 2014-05-15 17:22:23.131474312 +0200
@@ -423,10 +423,10 @@
macro_log_feature(KDEPIMLIBS_FOUND "KDE PIMLibs" "KDE Personal Information Management Libraries" "http://www.kde.org/" FALSE "" "Required by Plan and the KDE address book integration (available as a module in KDE)")
@@ -43,7 +43,7 @@ Index: calligra/CMakeLists.txt
Index: calligra/cmake/modules/FindEigen3.cmake
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ calligra/cmake/modules/FindEigen3.cmake 2014-03-04 17:45:14.204492224 +0100
++++ calligra/cmake/modules/FindEigen3.cmake 2014-05-15 17:22:23.131474312 +0200
@@ -0,0 +1,81 @@
+# - Try to find Eigen3 lib
+#
@@ -128,8 +128,8 @@ Index: calligra/cmake/modules/FindEigen3.cmake
+
Index: calligra/krita/image/kis_perspective_math.cpp
===================================================================
---- calligra.orig/krita/image/kis_perspective_math.cpp 2014-03-04 17:45:14.208492319 +0100
-+++ calligra/krita/image/kis_perspective_math.cpp 2014-03-04 17:45:14.204492224 +0100
+--- calligra.orig/krita/image/kis_perspective_math.cpp 2014-05-15 17:22:23.135474153 +0200
++++ calligra/krita/image/kis_perspective_math.cpp 2014-05-15 17:22:23.131474312 +0200
@@ -86,7 +86,7 @@
b.coeffRef(8) = 1;
// dbgImage <<" a := { {" << a(0,0) <<" ," << a(0,1) <<" ," << a(0,2) <<" ," << a(0,3) <<" ," << a(0,4) <<" ," << a(0,5) <<" ," << a(0,6) <<" ," << a(0,7) <<" ," << a(0,8) <<" } , {" << a(1,0) <<" ," << a(1,1) <<" ," << a(1,2) <<" ," << a(1,3) <<" ," << a(1,4) <<" ," << a(1,5) <<" ," << a(1,6) <<" ," << a(1,7) <<" ," << a(1,8) <<" } , {" << a(2,0) <<" ," << a(2,1) <<" ," << a(2,2) <<" ," << a(2,3) <<" ," << a(2,4) <<" ," << a(2,5) <<" ," << a(2,6) <<" ," << a(2,7) <<" ," << a(2,8) <<" } , {" << a(3,0) <<" ," << a(3,1) <<" ," << a(3,2) <<" ," << a(3,3) <<" ," << a(3,4) <<" ," << a(3,5) <<" ," << a(3,6) <<" ," << a(3,7) <<" ," << a(3,8) <<" } , {" << a(4,0) <<" ," << a(4,1) <<" ," << a(4,2) <<" ," << a(4,3) <<" ," << a(4,4) <<" ," << a(4,5) <<" ," << a(4,6) <<" ," << a(4,7) <<" ," << a(4,8) <<" } , {" << a(5,0) <<" ," << a(5,1) <<" ," << a(5,2) <<" ," << a(5,3) <<" ," << a(5,4) <<" ," << a(5,5) <<" ," << a(5,6) <<" ," << a(5,7) <<" ," << a(5,8) <<" } , {" << a(6,0) <<" ," << a(6,1) <<" ," << a(6,2) <<" ," << a(6,3) <<" ," << a(6,4) <<" ," << a(6,5) <<" ," << a(6,6) <<" ," << a(6,7) <<" ," << a(6,8) <<" } , {"<< a(7,0) <<" ," << a(7,1) <<" ," << a(7,2) <<" ," << a(7,3) <<" ," << a(7,4) <<" ," << a(7,5) <<" ," << a(7,6) <<" ," << a(7,7) <<" ," << a(7,8) <<" } , {"<< a(8,0) <<" ," << a(8,1) <<" ," << a(8,2) <<" ," << a(8,3) <<" ," << a(8,4) <<" ," << a(8,5) <<" ," << a(8,6) <<" ," << a(8,7) <<" ," << a(8,8) <<" } };";
@@ -141,8 +141,8 @@ Index: calligra/krita/image/kis_perspective_math.cpp
return matrix;
Index: calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp
===================================================================
---- calligra.orig/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp 2014-03-04 17:45:14.208492319 +0100
-+++ calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp 2014-03-04 17:45:14.204492224 +0100
+--- calligra.orig/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp 2014-05-15 17:22:23.135474153 +0200
++++ calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp 2014-05-15 17:22:23.131474312 +0200
@@ -21,7 +21,7 @@
#include <QMouseEvent>
@@ -154,8 +154,8 @@ Index: calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color
#include "KoColor.h"
Index: calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp
===================================================================
---- calligra.orig/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp 2014-03-04 17:45:14.208492319 +0100
-+++ calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp 2014-03-04 17:45:14.204492224 +0100
+--- calligra.orig/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp 2014-05-15 17:22:23.135474153 +0200
++++ calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp 2014-05-15 17:22:23.131474312 +0200
@@ -21,7 +21,7 @@
#include <QMouseEvent>
@@ -167,8 +167,8 @@ Index: calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color
#include "KoColor.h"
Index: calligra/krita/plugins/paintops/libbrush/CMakeLists.txt
===================================================================
---- calligra.orig/krita/plugins/paintops/libbrush/CMakeLists.txt 2014-03-04 17:45:14.208492319 +0100
-+++ calligra/krita/plugins/paintops/libbrush/CMakeLists.txt 2014-03-04 17:45:14.204492224 +0100
+--- calligra.orig/krita/plugins/paintops/libbrush/CMakeLists.txt 2014-05-15 17:22:23.135474153 +0200
++++ calligra/krita/plugins/paintops/libbrush/CMakeLists.txt 2014-05-15 17:22:23.131474312 +0200
@@ -1,5 +1,6 @@
add_subdirectory( tests )
@@ -178,8 +178,8 @@ Index: calligra/krita/plugins/paintops/libbrush/CMakeLists.txt
kis_auto_brush.cpp
Index: calligra/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc
===================================================================
---- calligra.orig/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc 2014-03-04 17:45:14.208492319 +0100
-+++ calligra/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc 2014-03-04 17:45:14.204492224 +0100
+--- calligra.orig/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc 2014-05-15 17:22:23.135474153 +0200
++++ calligra/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc 2014-05-15 17:22:23.131474312 +0200
@@ -35,7 +35,7 @@
#include <KoCompositeOp.h>
@@ -191,8 +191,8 @@ Index: calligra/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc
#include "kis_canvas2.h"
Index: calligra/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h
===================================================================
---- calligra.orig/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h 2014-03-04 17:45:14.208492319 +0100
-+++ calligra/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h 2014-03-04 17:45:14.204492224 +0100
+--- calligra.orig/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h 2014-05-15 17:22:23.135474153 +0200
++++ calligra/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h 2014-05-15 17:22:23.131474312 +0200
@@ -42,7 +42,7 @@
}
@@ -204,8 +204,8 @@ Index: calligra/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h
Index: calligra/sheets/CMakeLists.txt
===================================================================
---- calligra.orig/sheets/CMakeLists.txt 2014-03-04 17:45:14.208492319 +0100
-+++ calligra/sheets/CMakeLists.txt 2014-03-04 17:45:14.204492224 +0100
+--- calligra.orig/sheets/CMakeLists.txt 2014-05-15 17:22:23.135474153 +0200
++++ calligra/sheets/CMakeLists.txt 2014-05-15 17:22:23.131474312 +0200
@@ -5,7 +5,7 @@
${KOTEXT_INCLUDES}
${TEXTLAYOUT_INCLUDES}
@@ -217,8 +217,8 @@ Index: calligra/sheets/CMakeLists.txt
Index: calligra/sheets/functions/CMakeLists.txt
===================================================================
---- calligra.orig/sheets/functions/CMakeLists.txt 2014-03-04 17:45:14.208492319 +0100
-+++ calligra/sheets/functions/CMakeLists.txt 2014-03-04 17:45:14.204492224 +0100
+--- calligra.orig/sheets/functions/CMakeLists.txt 2014-05-15 17:22:23.135474153 +0200
++++ calligra/sheets/functions/CMakeLists.txt 2014-05-15 17:22:23.131474312 +0200
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_SOURCE_DIR}/sheets ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} ${EIGEN2_INCLUDE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/sheets ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} ${EIGEN3_INCLUDE_DIR})
@@ -227,8 +227,8 @@ Index: calligra/sheets/functions/CMakeLists.txt
########### next target ###############
Index: calligra/sheets/functions/math.cpp
===================================================================
---- calligra.orig/sheets/functions/math.cpp 2014-03-04 17:45:14.208492319 +0100
-+++ calligra/sheets/functions/math.cpp 2014-03-04 17:45:14.204492224 +0100
+--- calligra.orig/sheets/functions/math.cpp 2014-05-15 17:22:23.135474153 +0200
++++ calligra/sheets/functions/math.cpp 2014-05-15 17:22:23.135474153 +0200
@@ -1228,9 +1228,9 @@
Eigen::MatrixXd eMatrix = convert(matrix, calc),
@@ -243,8 +243,8 @@ Index: calligra/sheets/functions/math.cpp
return Value::errorDIV0();
Index: calligra/sheets/tests/CMakeLists.txt
===================================================================
---- calligra.orig/sheets/tests/CMakeLists.txt 2014-03-04 17:45:14.208492319 +0100
-+++ calligra/sheets/tests/CMakeLists.txt 2014-03-04 17:45:14.204492224 +0100
+--- calligra.orig/sheets/tests/CMakeLists.txt 2014-05-15 17:22:23.135474153 +0200
++++ calligra/sheets/tests/CMakeLists.txt 2014-05-15 17:22:23.135474153 +0200
@@ -1,6 +1,6 @@
include(MacroAddCompileFlags)
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
@@ -255,9 +255,9 @@ Index: calligra/sheets/tests/CMakeLists.txt
Index: calligra/krita/CMakeLists.txt
===================================================================
---- calligra.orig/krita/CMakeLists.txt 2014-03-04 17:45:14.208492319 +0100
-+++ calligra/krita/CMakeLists.txt 2014-03-04 17:45:14.204492224 +0100
-@@ -107,7 +107,7 @@
+--- calligra.orig/krita/CMakeLists.txt 2014-05-15 17:22:23.135474153 +0200
++++ calligra/krita/CMakeLists.txt 2014-05-15 17:22:23.135474153 +0200
+@@ -108,7 +108,7 @@
${CMAKE_SOURCE_DIR}/libs/widgets/colorwidgets
${CMAKE_SOURCE_DIR}/libs/widgetutils
diff --git a/debian/patches/temporarily_disable_failing_tests b/debian/patches/temporarily_disable_failing_tests
index 455e716..58c7742 100644
--- a/debian/patches/temporarily_disable_failing_tests
+++ b/debian/patches/temporarily_disable_failing_tests
@@ -1,8 +1,8 @@
Index: calligra/krita/plugins/extensions/gmic/tests/CMakeLists.txt
===================================================================
---- calligra.orig/krita/plugins/extensions/gmic/tests/CMakeLists.txt 2014-03-05 13:40:18.222668133 +0100
-+++ calligra/krita/plugins/extensions/gmic/tests/CMakeLists.txt 2014-03-06 13:40:40.062795911 +0100
-@@ -18,9 +18,9 @@
+--- calligra.orig/krita/plugins/extensions/gmic/tests/CMakeLists.txt 2014-05-15 17:22:31.387146685 +0200
++++ calligra/krita/plugins/extensions/gmic/tests/CMakeLists.txt 2014-05-15 17:22:31.383146845 +0200
+@@ -23,9 +23,9 @@
########### next target ###############
@@ -17,8 +17,8 @@ Index: calligra/krita/plugins/extensions/gmic/tests/CMakeLists.txt
set(kis_gmic_benchmarks_SRCS kis_gmic_benchmarks.cpp ${kritagmic_parser_PART_SRCS})
Index: calligra/krita/plugins/paintops/libbrush/tests/CMakeLists.txt
===================================================================
---- calligra.orig/krita/plugins/paintops/libbrush/tests/CMakeLists.txt 2014-03-05 13:40:18.378671833 +0100
-+++ calligra/krita/plugins/paintops/libbrush/tests/CMakeLists.txt 2014-03-06 13:40:52.687094644 +0100
+--- calligra.orig/krita/plugins/paintops/libbrush/tests/CMakeLists.txt 2014-05-15 17:22:31.387146685 +0200
++++ calligra/krita/plugins/paintops/libbrush/tests/CMakeLists.txt 2014-05-15 17:22:31.387146685 +0200
@@ -7,9 +7,9 @@
########### next target ###############
@@ -34,8 +34,8 @@ Index: calligra/krita/plugins/paintops/libbrush/tests/CMakeLists.txt
Index: calligra/krita/ui/tests/CMakeLists.txt
===================================================================
---- calligra.orig/krita/ui/tests/CMakeLists.txt 2014-03-05 13:40:18.518675155 +0100
-+++ calligra/krita/ui/tests/CMakeLists.txt 2014-03-06 13:40:19.106298256 +0100
+--- calligra.orig/krita/ui/tests/CMakeLists.txt 2014-05-15 17:22:31.387146685 +0200
++++ calligra/krita/ui/tests/CMakeLists.txt 2014-05-15 17:22:31.387146685 +0200
@@ -100,15 +100,15 @@
########### next target ###############
--
Calligra suite packaging
More information about the pkg-kde-commits
mailing list