applied upstream in the correct branch
authormirabilos <tg@debian.org>
Mon, 26 Oct 2020 15:30:16 +0000 (16:30 +0100)
committermirabilos <mirabilos@evolvis.org>
Mon, 26 Oct 2020 15:30:16 +0000 (16:30 +0100)
debian/patches/series
debian/patches/upstream/fix-accidental-paren-pos.diff [moved from debian/patches/experiments/fix-accidental-paren-pos.diff with 95% similarity]

index 7ae2e64..19761a1 100644 (file)
@@ -79,9 +79,9 @@ backports/63-minimise-window.diff
 upstream/silence-qdebug.diff
 upstream/statusline-pitch-onofftime.diff
 upstream/improve-mscore-font.diff
 upstream/silence-qdebug.diff
 upstream/statusline-pitch-onofftime.diff
 upstream/improve-mscore-font.diff
+upstream/fix-accidental-paren-pos.diff
 experiments/element-barbeat.diff
 experiments/smufl-fixes.diff
 experiments/element-barbeat.diff
 experiments/smufl-fixes.diff
-experiments/fix-accidental-paren-pos.diff
 experiments/revert-restriking-patch.diff
 experiments/log-collisions.diff
 #debian-specific/qt-5.7.diff
 experiments/revert-restriking-patch.diff
 experiments/log-collisions.diff
 #debian-specific/qt-5.7.diff
@@ -5,7 +5,7 @@ Description: honour symbol advance width from font when drawing accidentals
  of a parenthesised ♭
 Author: mirabilos <m@mirbsd.org>
 Forwarded: https://github.com/musescore/MuseScore/pull/6759
  of a parenthesised ♭
 Author: mirabilos <m@mirbsd.org>
 Forwarded: https://github.com/musescore/MuseScore/pull/6759
-Applied-Upstream: v4.0, commit:64e861321a900059d3affe1d1c5ba63a2c432e03
+Applied-Upstream: v3.6, commit:1d81510cdaa67d8787067c0774674bcbaedbb11c
 
 --- a/libmscore/accidental.cpp
 +++ b/libmscore/accidental.cpp
 
 --- a/libmscore/accidental.cpp
 +++ b/libmscore/accidental.cpp