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,11 @@ +musescore (0.9.6+dfsg-1ubuntu1) maverick; urgency=low + + * armel-float-cast-fix.dpatch: + - Fixes armel build by explicit cast of qreal reference to + double return type(LP: #642117) + + -- Niall Creech Tue, 21 Sep 2010 14:04:09 +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 @@ +armel-float-cast-fix.dpatch only in patch2: unchanged: --- musescore-0.9.6+dfsg.orig/debian/patches/armel-float-cast-fix.dpatch +++ musescore-0.9.6+dfsg/debian/patches/armel-float-cast-fix.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## armel-float-cast-fix.dpatch by Niall Creech +## +## Author: Niall Creech +## Description: Fixes armel build by explicit cast of qreal reference to +## double return type +## Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/musecore/+bug/642117 + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 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 14:32:46.172001788 +0100 +@@ -189,8 +189,8 @@ + 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; } +- double& rxpos() { return _pos.rx(); } +- double& rypos() { return _pos.ry(); } ++ double& rxpos() { return (double)_pos.rx(); } ++ double& rypos() { return (double)_pos.ry(); } + virtual void move(double xd, double yd) { _pos += QPointF(xd, yd); } + virtual void move(const QPointF& s) { _pos += s; } +