[SCM] Calligra suite packaging branch, master, updated. debian/2.7.5-1-44-g7748e30
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Mar 6 09:01:45 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=f86572e
The following commit has been merged in the master branch:
commit f86572e4aa736e60a3fad98f32b70c1a036fbb2d
Author: Maximiliano Curia <maxy at debian.org>
Date: Tue Mar 4 17:56:59 2014 +0100
Refresh patches
---
debian/changelog | 1 +
debian/patches/add_keywords_to_desktop_files.patch | 72 +++++++++----------
debian/patches/eigen3.patch | 84 ++++++++++++++--------
3 files changed, 92 insertions(+), 65 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c5c260a..a3a79bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ calligra (1:2.8.0-1) UNRELEASED; urgency=low
* Remove obsolete patch: pqxx_4_support.diff
* Update build dependencies.
* Add autopkgtests.
+ * Refresh patches
-- Adrien Grellier <perso at adrieng.fr> Sun, 15 Dec 2013 20:15:29 +0100
diff --git a/debian/patches/add_keywords_to_desktop_files.patch b/debian/patches/add_keywords_to_desktop_files.patch
index 1a0e26b..7fd0c2b 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 2013-12-26 11:12:41.429000355 +0100
-+++ calligra/kexi/kexi.desktop 2013-12-26 11:12:41.421000310 +0100
-@@ -171,3 +171,4 @@
+--- 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 @@
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 2013-12-26 11:12:41.429000355 +0100
-+++ calligra/stage/app/stage.desktop 2013-12-26 11:12:41.421000310 +0100
-@@ -127,3 +127,4 @@
+--- 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 @@
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 2013-12-26 11:12:41.429000355 +0100
-+++ calligra/active/calligraactive.desktop 2013-12-26 11:12:41.421000310 +0100
-@@ -40,3 +40,4 @@
+--- 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 @@
#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 2013-12-26 11:12:41.429000355 +0100
-+++ calligra/words/part/author/author.desktop 2013-12-26 11:12:41.421000310 +0100
-@@ -95,3 +95,4 @@
+--- 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 @@
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 2013-12-26 11:12:41.429000355 +0100
-+++ calligra/flow/part/flow.desktop 2013-12-26 11:12:41.421000310 +0100
-@@ -102,3 +102,4 @@
+--- 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 @@
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 2013-12-26 11:12:41.429000355 +0100
-+++ calligra/braindump/data/braindump.desktop 2013-12-26 11:12:41.421000310 +0100
-@@ -78,3 +78,4 @@
+--- 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 @@
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 2013-12-26 11:12:41.429000355 +0100
-+++ calligra/sheets/sheets.desktop 2013-12-26 11:12:41.421000310 +0100
-@@ -121,3 +121,4 @@
+--- 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 @@
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 2013-12-26 11:12:41.429000355 +0100
-+++ calligra/krita/krita.desktop 2013-12-26 11:13:19.109187194 +0100
-@@ -128,3 +128,4 @@
+--- 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 @@
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 2013-12-26 11:12:41.429000355 +0100
-+++ calligra/karbon/data/karbon.desktop 2013-12-26 11:12:41.425000329 +0100
-@@ -142,3 +142,4 @@
+--- 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 @@
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 2013-12-26 11:12:41.429000355 +0100
-+++ calligra/words/app/words.desktop 2013-12-26 11:12:41.425000329 +0100
-@@ -131,3 +131,4 @@
+--- 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 @@
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 2013-12-26 11:12:41.429000355 +0100
-+++ calligra/plan/plan.desktop 2013-12-26 11:13:56.217371218 +0100
-@@ -100,3 +100,4 @@
+--- 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 @@
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 2013-12-26 11:12:41.429000355 +0100
-+++ calligra/plan/workpackage/planwork.desktop 2013-12-26 11:12:41.425000329 +0100
-@@ -94,3 +94,4 @@
+--- 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 @@
Categories=Qt;KDE;Office;
X-KDE-StartupNotify=true
X-DocPath=http://userbase.kde.org/PlanWork/Manual
diff --git a/debian/patches/eigen3.patch b/debian/patches/eigen3.patch
index 42c206b..97d13b7 100644
--- a/debian/patches/eigen3.patch
+++ b/debian/patches/eigen3.patch
@@ -3,9 +3,11 @@ Author: Anton Gladky <gladk at debian.org>
Bug-Debian: http://bugs.debian.org/726643
Last-Update: 2013-10-17
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -421,10 +421,10 @@
+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
+@@ -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)")
##
@@ -19,7 +21,7 @@ Last-Update: 2013-10-17
##
## Test for QCA2
-@@ -931,13 +931,13 @@
+@@ -933,13 +933,13 @@
calligra_disable_product(RDF "Soprano not found")
endif(NOT Soprano_FOUND)
@@ -38,8 +40,10 @@ Last-Update: 2013-10-17
if(NOT APPLE AND NOT REQUIRED_Xinput_FOUND)
calligra_disable_product(KRITA_APP "Xinput devel not found ")
---- /dev/null
-+++ b/cmake/modules/FindEigen3.cmake
+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
@@ -0,0 +1,81 @@
+# - Try to find Eigen3 lib
+#
@@ -122,8 +126,10 @@ Last-Update: 2013-10-17
+
+endif(EIGEN3_INCLUDE_DIR)
+
---- a/krita/image/kis_perspective_math.cpp
-+++ b/krita/image/kis_perspective_math.cpp
+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
@@ -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) <<" } };";
@@ -133,8 +139,10 @@ Last-Update: 2013-10-17
Matrix3qreal matrix;
for (int r = 0; r < 3; r++) for (int c = 0; c < 3; c++) matrix.coeffRef(r, c) = v.coeff(3 * r + c);
return matrix;
---- a/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp
-+++ b/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp
+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
@@ -21,7 +21,7 @@
#include <QMouseEvent>
@@ -144,8 +152,10 @@ Last-Update: 2013-10-17
#include <cmath>
#include "KoColor.h"
---- a/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp
-+++ b/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp
+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
@@ -21,7 +21,7 @@
#include <QMouseEvent>
@@ -155,8 +165,10 @@ Last-Update: 2013-10-17
#include <cmath>
#include "KoColor.h"
---- a/krita/plugins/paintops/libbrush/CMakeLists.txt
-+++ b/krita/plugins/paintops/libbrush/CMakeLists.txt
+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
@@ -1,5 +1,6 @@
add_subdirectory( tests )
@@ -164,8 +176,10 @@ Last-Update: 2013-10-17
set(kritalibbrush_LIB_SRCS
kis_predefined_brush_factory.cpp
kis_auto_brush.cpp
---- a/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc
-+++ b/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc
+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
@@ -35,7 +35,7 @@
#include <KoCompositeOp.h>
@@ -175,8 +189,10 @@ Last-Update: 2013-10-17
#include "kis_cursor.h"
#include "kis_canvas2.h"
---- a/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h
-+++ b/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.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
@@ -42,7 +42,7 @@
}
@@ -186,8 +202,10 @@ Last-Update: 2013-10-17
typedef Eigen::Matrix3d FilterMatrix;
---- a/sheets/CMakeLists.txt
-+++ b/sheets/CMakeLists.txt
+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
@@ -5,7 +5,7 @@
${KOTEXT_INCLUDES}
${TEXTLAYOUT_INCLUDES}
@@ -197,16 +215,20 @@ Last-Update: 2013-10-17
if (SHOULD_BUILD_SHEETS_PART)
---- a/sheets/functions/CMakeLists.txt
-+++ b/sheets/functions/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
@@ -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})
########### next target ###############
---- a/sheets/functions/math.cpp
-+++ b/sheets/functions/math.cpp
+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
@@ -1228,9 +1228,9 @@
Eigen::MatrixXd eMatrix = convert(matrix, calc),
@@ -219,8 +241,10 @@ Last-Update: 2013-10-17
return convert(eMatrixInverse);
} else
return Value::errorDIV0();
---- a/sheets/tests/CMakeLists.txt
-+++ b/sheets/tests/CMakeLists.txt
+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
@@ -1,6 +1,6 @@
include(MacroAddCompileFlags)
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
@@ -229,9 +253,11 @@ Last-Update: 2013-10-17
########### Core Functionality ###############
---- a/krita/CMakeLists.txt
-+++ b/krita/CMakeLists.txt
-@@ -104,7 +104,7 @@
+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 @@
${CMAKE_SOURCE_DIR}/libs/widgets/colorwidgets
${CMAKE_SOURCE_DIR}/libs/widgetutils
--
Calligra suite packaging
More information about the pkg-kde-commits
mailing list