diff -Nru musescore-0.9.6.2+dfsg/debian/changelog musescore-0.9.6.3+dfsg/debian/changelog --- musescore-0.9.6.2+dfsg/debian/changelog 2010-10-01 07:00:39.000000000 +0000 +++ musescore-0.9.6.3+dfsg/debian/changelog 2010-10-01 07:00:43.000000000 +0000 @@ -1,3 +1,11 @@ +musescore (0.9.6.3+dfsg-0ubuntu1) maverick; urgency=low + + * New upstream bugfix release (LP: #652276) + + Incorporates Niall's armel qreal patch (Closes: #597802) + * debian/musescore.sh: pactl test fixed (Closes: #596270) + + -- Toby Smithe Thu, 30 Sep 2010 17:20:26 +0100 + musescore (0.9.6.2+dfsg-1ubuntu1) maverick; urgency=low * 20_armel-float-cast-fix.dpatch: @@ -9,7 +17,7 @@ musescore (0.9.6.2+dfsg-1) unstable; urgency=low - * New upstream bugfix release: + * New upstream bugfix release (Closes: #593728) + Program icon used in window list. (Closes: #591913, LP: #599820) (debian/patches/19-fix-window-icon.dpatch) + Does not crash when reverting factory settings. (LP: #599226) diff -Nru musescore-0.9.6.2+dfsg/debian/mscore.sh musescore-0.9.6.3+dfsg/debian/mscore.sh --- musescore-0.9.6.2+dfsg/debian/mscore.sh 2010-10-01 07:00:39.000000000 +0000 +++ musescore-0.9.6.3+dfsg/debian/mscore.sh 2010-10-01 07:00:43.000000000 +0000 @@ -4,20 +4,20 @@ pgrep -f pulseaudio > /dev/null; PULSEAUDIO=$? PACTL=$(which pactl) -if [ "$PULSEAUDIO" -eq "0" ] && [ -e $PACTL ]; then +if [ "$PULSEAUDIO" -eq "0" ] && [ -e "$PACTL" ]; then JACK=$($PACTL list | grep jack-sink) PAMIXINGVER="0.9.19" MIXING=$(echo `$PACTL stat | grep Version | cut -d" " -f3` $PAMIXINGVER | gawk '{ print ($1 >= $2) ? 1 : 0 }') PASUSPENDER=$(which pasuspender) - if [ $PACTL -a $JACK ]; then + if [ "$PACTL" -a "$JACK" ]; then echo "Using JACK for audio"; $MSCORE "$@"; - elif [ $MIXING ]; then + elif [ "$MIXING" ]; then echo "PulseAudio found, but no need to suspend. Starting mscore.real..."; $MSCORE "$@"; - elif [ $PASUSPENDER ]; then + elif [ "$PASUSPENDER" ]; then echo "Suspending PulseAudio"; $PASUSPENDER -- $MSCORE "$@"; else @@ -25,7 +25,7 @@ $MSCORE "$@"; fi -elif [ "$PULSEAUDIO" -eq "0" ] && [ ! -e $PACTL ]; then +elif [ "$PULSEAUDIO" -eq "0" ] && [ ! -e "$PACTL" ]; then echo "Warning: PulseAudio enabled, but pactl not available" echo "Please install pulseaudio-utils to get the best experience" diff -Nru musescore-0.9.6.2+dfsg/debian/patches/00list musescore-0.9.6.3+dfsg/debian/patches/00list --- musescore-0.9.6.2+dfsg/debian/patches/00list 2010-10-01 07:00:39.000000000 +0000 +++ musescore-0.9.6.3+dfsg/debian/patches/00list 2010-10-01 07:00:43.000000000 +0000 @@ -17,5 +17,4 @@ # dropped 16-ProcessHTML with 0.9.6b2421 # 17-ProcessHTML-remove-ja 18-correct-sf2-path -20_armel-float-cast-fix.dpatch 19-fix-window-icon diff -Nru musescore-0.9.6.2+dfsg/debian/patches/20_armel-float-cast-fix.dpatch musescore-0.9.6.3+dfsg/debian/patches/20_armel-float-cast-fix.dpatch --- musescore-0.9.6.2+dfsg/debian/patches/20_armel-float-cast-fix.dpatch 2010-10-01 07:00:39.000000000 +0000 +++ musescore-0.9.6.3+dfsg/debian/patches/20_armel-float-cast-fix.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## armel-float-cast-fix.dpatch by Niall Creech -## -## Author: Niall Creech -## 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-22 08:54:45.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-22 08:54:45.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; } - -diff -urNad musescore-0.9.6+dfsg~/mscore/mscore/mscore.cpp musescore-0.9.6+dfsg/mscore/mscore/mscore.cpp ---- musescore-0.9.6+dfsg~/mscore/mscore/mscore.cpp 2010-09-22 08:54:44.000000000 +0100 -+++ musescore-0.9.6+dfsg/mscore/mscore/mscore.cpp 2010-09-22 08:55:31.000000000 +0100 -@@ -81,7 +81,7 @@ - - QString dataPath; - QPaintDevice* pdev; --double PDPI, DPI, DPMM; -+qreal PDPI, DPI, DPMM; - double SPATIUM; - - QString mscoreGlobalShare; -diff -urNad musescore-0.9.6+dfsg~/mscore/mscore/scoreview.cpp musescore-0.9.6+dfsg/mscore/mscore/scoreview.cpp ---- musescore-0.9.6+dfsg~/mscore/mscore/scoreview.cpp 2010-06-07 22:26:55.000000000 +0100 -+++ musescore-0.9.6+dfsg/mscore/mscore/scoreview.cpp 2010-09-22 08:54:45.000000000 +0100 -@@ -2256,7 +2256,7 @@ - // setMag - //--------------------------------------------------------- - --void ScoreView::setMag(double nmag) -+void ScoreView::setMag(qreal nmag) - { - qreal m = mag(); - diff -Nru musescore-0.9.6.2+dfsg/mscore/al/sig.cpp musescore-0.9.6.3+dfsg/mscore/al/sig.cpp --- musescore-0.9.6.2+dfsg/mscore/al/sig.cpp 2010-08-16 13:20:06.000000000 +0000 +++ musescore-0.9.6.3+dfsg/mscore/al/sig.cpp 2010-09-25 07:58:09.000000000 +0000 @@ -1,7 +1,7 @@ //============================================================================= // MuseScore // Linux Music Score Editor -// $Id: sig.cpp 3117 2010-06-02 09:21:44Z wschweer $ +// $Id: sig.cpp 3482 2010-09-21 07:10:03Z lasconic $ // // Copyright (C) 2002-2007 Werner Schweer and others // @@ -468,5 +468,16 @@ return e.fraction() - Fraction::fromTicks(tick - stick); } -} // namespace AL +//--------------------------------------------------------- +// TimeSigMap::dump +//--------------------------------------------------------- +void TimeSigMap::dump() const + { + printf("TimeSigMap:\n"); + for (ciSigEvent i = begin(); i != end(); ++i) + printf("%6d timesig: %s measure: %d\n", + i->first, qPrintable(i->second.fraction().print()), i->second.bar); + } + +} // namespace AL diff -Nru musescore-0.9.6.2+dfsg/mscore/al/sig.h musescore-0.9.6.3+dfsg/mscore/al/sig.h --- musescore-0.9.6.2+dfsg/mscore/al/sig.h 2010-08-16 13:20:06.000000000 +0000 +++ musescore-0.9.6.3+dfsg/mscore/al/sig.h 2010-09-25 07:58:09.000000000 +0000 @@ -1,7 +1,7 @@ //============================================================================= // MusE Score // Linux Music Score Editor -// $Id: sig.h 3059 2010-05-07 07:42:10Z wschweer $ +// $Id: sig.h 3482 2010-09-21 07:10:03Z lasconic $ // // Copyright (C) 2002-2009 Werner Schweer and others // @@ -80,6 +80,7 @@ void read(QDomElement, int fileDiv); void write(Xml&) const; + void dump() const; const SigEvent& timesig(int tick) const; diff -Nru musescore-0.9.6.2+dfsg/mscore/ChangeLog musescore-0.9.6.3+dfsg/mscore/ChangeLog --- musescore-0.9.6.2+dfsg/mscore/ChangeLog 2010-08-16 13:24:59.000000000 +0000 +++ musescore-0.9.6.3+dfsg/mscore/ChangeLog 2010-09-25 08:03:20.000000000 +0000 @@ -1,3 +1,37 @@ +24.sep + (la) + - fix #7150: Changing soundfont does not work for audio export +23.sep (la) + - fix #7233: Transpose by diminished second doesn't work (0.9.6 branch regression) + - fix #7232: D.S. after coda sign freezes playback +23.sep (la) + - Apply patch for ARM qreal bug +22.sep (ws) + - tuplet bracket was only movable in x-direction in edit mode + (la) + - fix #7211: Copy/Paste notes over rest of diff. durations in staves +21.sep (la) + - fix #7167: Time signature change causes triplets to corrupt score + - fix #7142: Crescendo & delete measures problems + - fix #7197: MuseScore fails to open MSCZ files with capitals + - fix #6932: Changing notehead of a breve crash + - add access to DPI, notehead, note bounding box and note position from plugin framework + (Patch by Mikhail Eliseev) +14.sep (la) + - fix #7077: Applying double-note tremolo to dotted notes fails and alter measure duration +30.aug (db) + - fix #6937: Measure Properties should be modal dialog +29.aug (la) + - fix #6775: Seg. fault by double clicking any element twice + - fix #6888: When exchanging voice, voice 1 is removed +28.aug (la) + - fix get keysig from plugin when concert pitch mode is set +24.aug (ws) + - applied patch to rendermidi.cpp from Hugo Scott Whittle +22.aug (db) + - fix #6735: C# for AltoSax in default soundfont is silent + + ======== MuseScore 0.9.6.2 released ============== 15.aug (la) - fix #6658: Natural in every keysig on mac PPC - fix #6508: Crash removing instrument with volta @@ -17,7 +51,7 @@ - fix instrument name containing flats for plugin framework 14.jul (ws) - fix mouse wheel handling for mixer elements -======== MuseScore 0.9.6.2 released ============== +======== MuseScore 0.9.6.1 released ============== 12.jul (ws) - fix #6453: File containing a horizontal frame directly before a bar with a line break cannot be opened (la) diff -Nru musescore-0.9.6.2+dfsg/mscore/CMakeLists.txt musescore-0.9.6.3+dfsg/mscore/CMakeLists.txt --- musescore-0.9.6.2+dfsg/mscore/CMakeLists.txt 2010-08-16 13:24:59.000000000 +0000 +++ musescore-0.9.6.3+dfsg/mscore/CMakeLists.txt 2010-09-25 08:03:20.000000000 +0000 @@ -61,7 +61,7 @@ # The Mscore version number. SET(Mscore_VERSION_MAJOR "0") SET(Mscore_VERSION_MINOR "9") -SET(Mscore_VERSION_PATCH "6.2") +SET(Mscore_VERSION_PATCH "6.3") SET(Mscore_VERSION "${Mscore_VERSION_MAJOR}.${Mscore_VERSION_MINOR}") SET(Mscore_VERSION_FULL "${Mscore_VERSION}.${Mscore_VERSION_PATCH}") diff -Nru musescore-0.9.6.2+dfsg/mscore/manual/CMakeLists.txt musescore-0.9.6.3+dfsg/mscore/manual/CMakeLists.txt --- musescore-0.9.6.2+dfsg/mscore/manual/CMakeLists.txt 2010-08-16 13:24:59.000000000 +0000 +++ musescore-0.9.6.3+dfsg/mscore/manual/CMakeLists.txt 2010-09-25 08:03:19.000000000 +0000 @@ -19,6 +19,7 @@ #============================================================================= install(FILES + MuseScore-da.pdf MuseScore-de.pdf MuseScore-en.pdf MuseScore-es.pdf diff -Nru musescore-0.9.6.2+dfsg/mscore/manual/ProcessHTML.py musescore-0.9.6.3+dfsg/mscore/manual/ProcessHTML.py --- musescore-0.9.6.2+dfsg/mscore/manual/ProcessHTML.py 2010-08-16 13:24:59.000000000 +0000 +++ musescore-0.9.6.3+dfsg/mscore/manual/ProcessHTML.py 2010-09-25 08:03:19.000000000 +0000 @@ -47,7 +47,7 @@ split = html_source.split('')+1:split[i].index('')].lower().replace(" ","-") + name = split[i][split[i].index('>')+1:split[i].index('')].decode("utf-8").lower().encode("utf-8").replace(" ","-") name = name.replace("'","") #remove HTML encoding for French apostrophe name = name.replace(",","").replace("(","").replace(")","") #remove punctuation @@ -61,7 +61,7 @@ name = name.replace('li%c3%b1as','li%c3%b1') #workaround incorrect url on website (Galacian handbook) split[i-1] = split[i-1] + '' anchors.append(name) - print name + #print name html_source = ' - + + + + + + + + + +

+ + +

+ + + + + + + + + + diff -Nru musescore-0.9.6.2+dfsg/mscore/manual/sources/MuseScore-de.html musescore-0.9.6.3+dfsg/mscore/manual/sources/MuseScore-de.html --- musescore-0.9.6.2+dfsg/mscore/manual/sources/MuseScore-de.html 2010-08-16 13:21:37.000000000 +0000 +++ musescore-0.9.6.3+dfsg/mscore/manual/sources/MuseScore-de.html 2010-09-25 07:59:41.000000000 +0000 @@ -4,7 +4,7 @@ - +