[SCM] Calligra suite packaging branch, master, updated. debian/2.7.5-1-44-g7748e30

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit fe6698e62b8ac3b7df81fd3784e897d58cd22d18
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Mar 4 17:57:27 2014 +0100

    New patch: eigen3_in_tests
---
 debian/changelog               |  1 +
 debian/patches/eigen3_in_tests | 42 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a3a79bd..babbe77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ calligra (1:2.8.0-1) UNRELEASED; urgency=low
   * Update build dependencies.
   * Add autopkgtests.
   * Refresh patches
+  * New patch: eigen3_in_tests
 
  -- Adrien Grellier <perso at adrieng.fr>  Sun, 15 Dec 2013 20:15:29 +0100
 
diff --git a/debian/patches/eigen3_in_tests b/debian/patches/eigen3_in_tests
new file mode 100644
index 0000000..3072bd5
--- /dev/null
+++ b/debian/patches/eigen3_in_tests
@@ -0,0 +1,42 @@
+Index: calligra/krita/image/tests/kis_convolution_painter_test.cpp
+===================================================================
+--- calligra.orig/krita/image/tests/kis_convolution_painter_test.cpp	2014-03-04 17:39:39.740483334 +0100
++++ calligra/krita/image/tests/kis_convolution_painter_test.cpp	2014-03-04 17:55:04.062648768 +0100
+@@ -117,15 +117,15 @@
+     dev->convertFromQImage(qimage, 0, 0, 0);
+ 
+     KisConvolutionKernelSP kernel = new KisConvolutionKernel(3, 3, 0, 0);
+-    kernel->data()[0] = 0;
+-    kernel->data()[1] = 0;
+-    kernel->data()[2] = 0;
+-    kernel->data()[3] = 0;
+-    kernel->data()[4] = 1;
+-    kernel->data()[5] = 0;
+-    kernel->data()[6] = 0;
+-    kernel->data()[7] = 0;
+-    kernel->data()[8] = 0;
++    kernel->data()(0) = 0;
++    kernel->data()(1) = 0;
++    kernel->data()(2) = 0;
++    kernel->data()(3) = 0;
++    kernel->data()(4) = 1;
++    kernel->data()(5) = 0;
++    kernel->data()(6) = 0;
++    kernel->data()(7) = 0;
++    kernel->data()(8) = 0;
+     KisConvolutionPainter gc(dev);
+     gc.beginTransaction(0);
+     gc.applyMatrix(kernel, dev, QPoint(0, 0), QPoint(0, 0), QSize(qimage.width(), qimage.height()));
+Index: calligra/krita/image/tests/kis_paint_information_test.cpp
+===================================================================
+--- calligra.orig/krita/image/tests/kis_paint_information_test.cpp	2014-03-04 17:39:39.748483525 +0100
++++ calligra/krita/image/tests/kis_paint_information_test.cpp	2014-03-04 17:54:45.750208699 +0100
+@@ -23,7 +23,7 @@
+ #include "kis_paint_information.h"
+ 
+ #include <QDomDocument>
+-#include <Eigen/Array>
++#include <Eigen/Core>
+ 
+ #include <kdebug.h>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 782512c..41de19d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 add_keywords_to_desktop_files.patch
 eigen3.patch
+eigen3_in_tests

-- 
Calligra suite packaging