diff -u musescore-0.9.6+dfsg/debian/changelog musescore-0.9.6+dfsg/debian/changelog
--- musescore-0.9.6+dfsg/debian/changelog
+++ musescore-0.9.6+dfsg/debian/changelog
@@ -1,3 +1,12 @@
+musescore (0.9.6+dfsg-1ubuntu1) maverick; urgency=low
+
+  * 20_armel-float-cast-fix.dpatch:
+    - Define alternative rxpos and rypos calls for armel to handle
+    its differenet QpointF rx() and ry() call return values. Ensure qMax
+    and qMin calls have equivalent argument types(LP: #642117)
+
+ -- Niall Creech <niallcreech@gmail.com>  Tue, 21 Sep 2010 19:23:50 +0100
+
 musescore (0.9.6+dfsg-1) unstable; urgency=low
 
   * New upstream release. (Closes: #585599)
diff -u musescore-0.9.6+dfsg/debian/patches/00list musescore-0.9.6+dfsg/debian/patches/00list
--- musescore-0.9.6+dfsg/debian/patches/00list
+++ musescore-0.9.6+dfsg/debian/patches/00list
@@ -19,0 +20 @@
+20_armel-float-cast-fix.dpatch
only in patch2:
unchanged:
--- musescore-0.9.6+dfsg.orig/debian/patches/20_armel-float-cast-fix.dpatch
+++ musescore-0.9.6+dfsg/debian/patches/20_armel-float-cast-fix.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## armel-float-cast-fix.dpatch by Niall Creech <niallcreech@gmail.com>
+##
+## Author: Niall Creech <niallcreech@gmail.com>
+## Description: Define alternative rxpos and rypos calls for armel to handle
+##  its differenet QpointF rx() and ry() call return values. Ensure qMax
+##  and qMin calls have equivalent argument types.
+## Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/musecore/+bug/642117
+@DPATCH@
+diff -urNad musescore-0.9.6+dfsg~/mscore/mscore/beam.cpp musescore-0.9.6+dfsg/mscore/mscore/beam.cpp
+--- musescore-0.9.6+dfsg~/mscore/mscore/beam.cpp	2010-06-07 22:26:55.000000000 +0100
++++ musescore-0.9.6+dfsg/mscore/mscore/beam.cpp	2010-09-21 20:44:10.000000000 +0100
+@@ -786,7 +786,7 @@
+ 
+             double x2 = npos.x();
+             double y1 = npos.y();
+-            double y  = _up ? qMin(p1dy, _p1[idx].y()) : qMax(p1dy, _p1[idx].y());
++            double y  = _up ? qMin(qreal(p1dy), _p1[idx].y()) : qMax(qreal(p1dy), _p1[idx].y());
+             double y2 = y + (x2 - x1) * slope + cp.y();
+ 
+             double stemLen = _up ? (y1 - y2) : (y2 - y1);
+diff -urNad musescore-0.9.6+dfsg~/mscore/mscore/element.h musescore-0.9.6+dfsg/mscore/mscore/element.h
+--- musescore-0.9.6+dfsg~/mscore/mscore/element.h	2010-06-07 22:26:55.000000000 +0100
++++ musescore-0.9.6+dfsg/mscore/mscore/element.h	2010-09-21 20:40:34.000000000 +0100
+@@ -189,8 +189,13 @@
+       void setPos(const QPointF& p)           { _pos = p;                }
+       void setPos(double x, double y)         { _pos.rx() = x; _pos.ry() = y;    }
+       void movePos(const QPointF& p)          { _pos += p;               }
++#ifdef __arm__
++      float& rxpos()                         { return _pos.rx();        }
++      float& rypos()                         { return _pos.ry();        }
++#else
+       double& rxpos()                         { return _pos.rx();        }
+       double& rypos()                         { return _pos.ry();        }
++#endif
+       virtual void move(double xd, double yd) { _pos += QPointF(xd, yd); }
+       virtual void move(const QPointF& s)     { _pos += s;               }
+