[SCM] Calligra suite packaging branch, tip, updated. debian/2.4.2-3-6-g4bcced3

[Adrien Grellier]

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

The following commit has been merged in the tip branch:
commit facad199cf0fdea6ede99bc9d673eeb710a2f22b
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Wed Jun 27 23:34:36 2012 +0200

    Update to upstream 2.4.3.
---
 debian/changelog                   |    6 +++++-
 debian/patches/compile_on_arm.diff |   23 -----------------------
 debian/patches/series              |    1 -
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 19cb111..81001ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,8 @@
-calligra (1:2.4.2-4) UNRELEASED; urgency=low
+calligra (1:2.4.3-1) UNRELEASED; urgency=low
+
+  [ Raúl Sánchez Siles ]
+  * New upstream release
+    - Removed patch compile_on_arm.diff, included upstream.
 
   [ Eshat Cakar ]
   * Improve package descriptions, thanks to Justin B Rye (Closes: #679230)
diff --git a/debian/patches/compile_on_arm.diff b/debian/patches/compile_on_arm.diff
deleted file mode 100644
index a1d43ec..0000000
--- a/debian/patches/compile_on_arm.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 58db794d10ab882a2ca9683476184758a58e4a2a
-Author: Marijn Kruisselbrink <mkruisselbrink at kde.org>
-Date:   Tue May 8 02:14:15 2012 +0200
-
-    compile on arm
-
-diff --git a/plugins/pathshapes/rectangle/RectangleShape.cpp b/plugins/pathshapes/rectangle/RectangleShape.cpp
-index 7c42b70..e83874d 100644
---- a/plugins/pathshapes/rectangle/RectangleShape.cpp
-+++ b/plugins/pathshapes/rectangle/RectangleShape.cpp
-@@ -60,9 +60,9 @@ bool RectangleShape::loadOdf(const KoXmlElement &element, KoShapeLoadingContext
-     } else {
-         QString cornerRadius = element.attributeNS(KoXmlNS::draw, "corner-radius", "");
-         if (! cornerRadius.isEmpty()) {
--            float radius = KoUnit::parseValue(cornerRadius);
--            m_cornerRadiusX = qMin(radius / (0.5 * size().width()) * 100, qreal(100));
--            m_cornerRadiusY = qMin(radius / (0.5 * size().height()) * 100, qreal(100));
-+            qreal radius = KoUnit::parseValue(cornerRadius);
-+            m_cornerRadiusX = qMin<qreal>(radius / (0.5 * size().width()) * 100, qreal(100));
-+            m_cornerRadiusY = qMin<qreal>(radius / (0.5 * size().height()) * 100, qreal(100));
-         }
-     }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 560506f..7dc314a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 do_not_link_blas.diff
-compile_on_arm.diff

-- 
Calligra suite packaging