rev 18468 - in trunk/packages/koffice/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2010-07-14 18:58:27 +0000 (Wed, 14 Jul 2010)
New Revision: 18468

Added:
   trunk/packages/koffice/debian/patches/
   trunk/packages/koffice/debian/patches/fix_arm_rev1124896.diff
   trunk/packages/koffice/debian/patches/series
Modified:
   trunk/packages/koffice/debian/changelog
Log:
patch for armel FTBFS 


Modified: trunk/packages/koffice/debian/changelog
===================================================================
--- trunk/packages/koffice/debian/changelog	2010-07-14 17:16:57 UTC (rev 18467)
+++ trunk/packages/koffice/debian/changelog	2010-07-14 18:58:27 UTC (rev 18468)
@@ -1,3 +1,10 @@
+koffice (1:2.2.1-3) UNRELEASED; urgency=low
+
+  * Fix build in armel, backport rev 1124896 from upstream.
+  * TODO: kformula description (Closes: #589066)
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Wed, 14 Jul 2010 20:55:40 +0200
+
 koffice (1:2.2.1-2) unstable; urgency=low
 
   * Upload to unstable. 

Added: trunk/packages/koffice/debian/patches/fix_arm_rev1124896.diff
===================================================================
--- trunk/packages/koffice/debian/patches/fix_arm_rev1124896.diff	                        (rev 0)
+++ trunk/packages/koffice/debian/patches/fix_arm_rev1124896.diff	2010-07-14 18:58:27 UTC (rev 18468)
@@ -0,0 +1,15 @@
+Index: KoPathSegmentChangeStrategy.cpp
+===================================================================
+--- KoPathSegmentChangeStrategy.cpp	(revision 1124895)
++++ KoPathSegmentChangeStrategy.cpp	(revision 1124896)
+@@ -39,8 +39,8 @@
+ {
+     const qreal eps = std::numeric_limits<qreal>::epsilon();
+     // force segment parameter range to avoid division by zero
+-    m_segmentParam = qBound(eps, m_segmentParam, 1.0-eps);
+-    
++    m_segmentParam = qBound(eps, m_segmentParam, qreal(1.0)-eps);
++
+     m_path = segment.pathShape;
+     m_segment = m_path->segmentByIndex(segment.pointIndex);
+     m_pointData2.pointIndex = m_path->pathPointIndex(m_segment.second());

Added: trunk/packages/koffice/debian/patches/series
===================================================================
--- trunk/packages/koffice/debian/patches/series	                        (rev 0)
+++ trunk/packages/koffice/debian/patches/series	2010-07-14 18:58:27 UTC (rev 18468)
@@ -0,0 +1 @@
+fix_arm_rev1124896.diff