mark patches as merged
authormirabilos <tg@debian.org>
Sun, 25 Oct 2020 23:20:42 +0000 (00:20 +0100)
committermirabilos <mirabilos@evolvis.org>
Sun, 25 Oct 2020 23:21:21 +0000 (00:21 +0100)
debian/patches/experiments/fix-accidental-paren-pos.diff
debian/patches/series
debian/patches/upstream/improve-mscore-font.diff [moved from debian/patches/experiments/improve-mscore-font.diff with 99% similarity]
debian/patches/upstream/silence-qdebug.diff [moved from debian/patches/experiments/silence-qdebug.diff with 87% similarity]
debian/patches/upstream/statusline-pitch-onofftime.diff [moved from debian/patches/experiments/statusline-pitch-onofftime.diff with 97% similarity]

index d27b243..2ee93f0 100644 (file)
@@ -4,7 +4,8 @@ Description: honour symbol advance width from font when drawing accidentals
  glyph from the accidental itself honoured fixing asymmetric render
  of a parenthesised â™­
 Author: mirabilos <m@mirbsd.org>
-Forwarded: https://github.com/musescore/MuseScore/pull/6742
+Forwarded: https://github.com/musescore/MuseScore/pull/6759
+Applied-Upstream: v4.0, commit:64e861321a900059d3affe1d1c5ba63a2c432e03
 
 --- a/libmscore/accidental.cpp
 +++ b/libmscore/accidental.cpp
index 02bd276..7ae2e64 100644 (file)
@@ -76,12 +76,12 @@ backports/59-blank-lines.diff
 upstream/wmclass.diff
 backports/62-measure-count.diff
 backports/63-minimise-window.diff
+upstream/silence-qdebug.diff
+upstream/statusline-pitch-onofftime.diff
+upstream/improve-mscore-font.diff
 experiments/element-barbeat.diff
 experiments/smufl-fixes.diff
 experiments/fix-accidental-paren-pos.diff
-experiments/improve-mscore-font.diff
-experiments/silence-qdebug.diff
-experiments/statusline-pitch-onofftime.diff
 experiments/revert-restriking-patch.diff
 experiments/log-collisions.diff
 #debian-specific/qt-5.7.diff
@@ -6,6 +6,7 @@ Description: merge Parnassus accidentals into MScore
  would have been more problematic…
 Author: mirabilos <m@mirbsd.org>
 Forwarded: https://github.com/musescore/MuseScore/pull/6747
+Applied-Upstream: v3.6, commit:2b3dbc9eb350761eae5615edf814be8dba05dfb0
 
 --- a/fonts/mscore/metadata.json
 +++ b/fonts/mscore/metadata.json
similarity index 87%
rename from debian/patches/experiments/silence-qdebug.diff
rename to debian/patches/upstream/silence-qdebug.diff
index c39d2f6..e2c5488 100644 (file)
@@ -1,6 +1,7 @@
 Description: silence some qDebug output
 Author: mirabilos <m@mirbsd.org>
 Forwarded: https://github.com/musescore/MuseScore/pull/6751
+Applied-Upstream: v3.6, commit:7502e7a24c4bdd840e2c426285aa783685ebab50
 
 --- a/libmscore/xmlreader.cpp
 +++ b/libmscore/xmlreader.cpp
@@ -13,6 +13,7 @@ Description: indicate pitch and on/off time in the status line
  (velocity is too hard, sorry about that).
 Author: mirabilos <m@mirbsd.org>
 Forwarded: https://github.com/musescore/MuseScore/pull/6750
+Applied-Upstream: v3.6, commit:d2de6bf4f409f552f4af4b856a545ff9811c398a
 
 --- a/libmscore/note.cpp
 +++ b/libmscore/note.cpp