update patch merged status
authormirabilos <tg@debian.org>
Sun, 31 Jan 2021 21:32:58 +0000 (22:32 +0100)
committermirabilos <mirabilos@evolvis.org>
Sun, 31 Jan 2021 21:32:58 +0000 (22:32 +0100)
debian/changelog
debian/patches/debian-specific/debundle-fonts.diff
debian/patches/series
debian/patches/upstream/smufl-fixes.diff [moved from debian/patches/experiments/smufl-fixes.diff with 99% similarity]

index 64e682d..ce6926d 100644 (file)
@@ -1,7 +1,6 @@
 musescore3 (3.2.3+dfsg2-8) unstable; urgency=medium
 
   * Sync SMuFL update to upstream
-  * Update patch submission status
   * Merge musescore2 (2.3.2+dfsg4-12) unstable; urgency=medium
     - Fix CFLAGS/CXXFLAGS extras to disable upstream-only warnings
     - Update list of MScore.ttf copyright holders again, document
@@ -13,8 +12,9 @@ musescore3 (3.2.3+dfsg2-8) unstable; urgency=medium
     - various plugin-related fixes
     - expose Score.selection object to access elements selected in GUI
     - add removeElement API and restore Chord.{add,remove} for plugins
+  * Update patch submission status
 
- -- Thorsten Glaser <tg@mirbsd.de>  Sun, 31 Jan 2021 22:26:56 +0100
+ -- Thorsten Glaser <tg@mirbsd.de>  Sun, 31 Jan 2021 22:32:17 +0100
 
 musescore3 (3.2.3+dfsg1-7) unstable; urgency=medium
 
index 9617528..1f90359 100644 (file)
@@ -52,7 +52,7 @@ Justification: distribution-specific packaging
  add_library (testResources STATIC
 --- a/mtest/testutils.cpp
 +++ b/mtest/testutils.cpp
-@@ -33,8 +33,6 @@ inline void initMyResources() {
+@@ -34,8 +34,6 @@ inline void initMyResources() {
        Q_INIT_RESOURCE(musescorefonts_Gootville);
        Q_INIT_RESOURCE(musescorefonts_Bravura);
        Q_INIT_RESOURCE(musescorefonts_MuseJazz);
@@ -60,4 +60,4 @@ Justification: distribution-specific packaging
 -      Q_INIT_RESOURCE(musescorefonts_Free);
  }
  
- extern Ms::Score::FileError importOve(Ms::Score*, const QString& name);
+ extern Ms::Score::FileError importOve(Ms::MasterScore*, const QString& name);
index 533b2f6..909baac 100644 (file)
@@ -88,8 +88,8 @@ upstream/silence-qdebug.diff
 upstream/statusline-pitch-onofftime.diff
 upstream/improve-mscore-font.diff
 upstream/fix-accidental-paren-pos.diff
+upstream/smufl-fixes.diff
 experiments/element-barbeat.diff
-experiments/smufl-fixes.diff
 experiments/revert-restriking-patch.diff
 experiments/log-collisions.diff
 #debian-specific/qt-5.7.diff
similarity index 99%
rename from debian/patches/experiments/smufl-fixes.diff
rename to debian/patches/upstream/smufl-fixes.diff
index bdd66b8..34f39a0 100644 (file)
@@ -3,6 +3,7 @@ Description: Update SMuFL metadata, fixing a typo and reducing indent
  and regenerate sym.* from it
 Author: mirabilos <m@mirbsd.org>
 Forwarded: https://github.com/musescore/MuseScore/pull/6742
+Applied-Upstream: v3.6, commit:013f65fe513add0e3869ab68a5d5bdb0fb550d48
 
 --- a/fonts/gootville/metadata.json
 +++ b/fonts/gootville/metadata.json