diff -Nru calligra-2.3.86/debian/changelog calligra-2.3.86/debian/changelog --- calligra-2.3.86/debian/changelog 2012-01-12 17:29:33.000000000 +0000 +++ calligra-2.3.86/debian/changelog 2012-01-13 17:34:52.000000000 +0000 @@ -1,3 +1,13 @@ +calligra (1:2.3.86-0ubuntu5) precise; urgency=low + + [ Jonathan Riddell ] + * Update kubuntu_01_arm_fixes.diff for more ARM missing qreal + + [ Michal Zajac ] + * Added braindump as Depends to calligra metapackage + + -- Michal Zajac Fri, 13 Jan 2012 17:30:47 +0000 + calligra (1:2.3.86-0ubuntu4) precise; urgency=low * Add kubuntu_01_arm_fixes.diff to fix ARM build failures diff -Nru calligra-2.3.86/debian/control calligra-2.3.86/debian/control --- calligra-2.3.86/debian/control 2012-01-11 17:16:45.000000000 +0000 +++ calligra-2.3.86/debian/control 2012-01-13 17:34:52.000000000 +0000 @@ -36,7 +36,7 @@ Depends: ${misc:Depends}, karbon (>= ${source:Version}), calligraflow (>= ${source:Version}), calligraplan (>= ${source:Version}), calligrastage (>= ${source:Version}), krita (>= ${source:Version}), calligratables (>= ${source:Version}), calligrawords (>= ${source:Version}), kthesaurus (>= ${source:Version}), - kexi (>= ${source:Version}) + kexi (>= ${source:Version}), braindump (>= ${source:Version}) Recommends: calligra-map-shape (>= ${source:Version}), create-resources Homepage: http://www.calligra-suite.org Description: integrated work applications suite diff -Nru calligra-2.3.86/debian/patches/kubuntu_01_arm_fixes.diff calligra-2.3.86/debian/patches/kubuntu_01_arm_fixes.diff --- calligra-2.3.86/debian/patches/kubuntu_01_arm_fixes.diff 2012-01-12 17:29:18.000000000 +0000 +++ calligra-2.3.86/debian/patches/kubuntu_01_arm_fixes.diff 2012-01-13 17:34:52.000000000 +0000 @@ -1,7 +1,7 @@ Index: calligra-2.3.86/krita/image/brushengine/kis_paint_information.cc =================================================================== --- calligra-2.3.86.orig/krita/image/brushengine/kis_paint_information.cc 2012-01-07 03:25:01.000000000 +0000 -+++ calligra-2.3.86/krita/image/brushengine/kis_paint_information.cc 2012-01-12 17:29:04.000000000 +0000 ++++ calligra-2.3.86/krita/image/brushengine/kis_paint_information.cc 2012-01-13 16:14:04.000000000 +0000 @@ -211,20 +211,20 @@ qreal KisPaintInformation::declination(const KisPaintInformation& info, qreal maxTiltX, qreal maxTiltY, bool normalize) @@ -28,3 +28,18 @@ + return normalize ? (declination / (M_PI * qreal(0.5))) : declination; } +Index: calligra-2.3.86/plugins/textshape/dialogs/QuickTableButton.cpp +=================================================================== +--- calligra-2.3.86.orig/plugins/textshape/dialogs/QuickTableButton.cpp 2012-01-07 03:25:03.000000000 +0000 ++++ calligra-2.3.86/plugins/textshape/dialogs/QuickTableButton.cpp 2012-01-13 16:16:43.000000000 +0000 +@@ -87,8 +87,8 @@ + + void SizeChooserGrid::mouseMoveEvent(QMouseEvent *ev) + { +- m_column = qMin(7.0, (ev->x()-m_leftMargin) / m_columnWidth); +- m_row = qMin(7.0, (ev->y()-m_topMargin) / m_rowHeight); ++ m_column = qMin(qreal(7.0), (ev->x()-m_leftMargin) / m_columnWidth); ++ m_row = qMin(qreal(7.0), (ev->y()-m_topMargin) / m_rowHeight); + repaint(); + } +