Merge branch 'rochade' into master
authormirabilos <tg@debian.org>
Thu, 30 Jul 2020 18:24:36 +0000 (20:24 +0200)
committermirabilos <mirabilos@evolvis.org>
Thu, 30 Jul 2020 18:24:36 +0000 (20:24 +0200)
1  2 
debian/changelog
debian/musescore3.lintian-overrides
debian/patches/experiments/smufl-typo.diff
debian/patches/series
debian/patches/upstream/ottava-size.diff
debian/patches/upstream/pitch-Cb-B#.diff
debian/patches/upstream/prefs-radio.diff
debian/patches/upstream/save-no-redundant.diff
debian/patches/upstream/synth-glitches.diff
debian/rules

 -musescore2 (2.3.2+dfsg3-10) UNRELEASED; urgency=medium
 +musescore (3.2.3+dfsg1-5) unstable; urgency=high
 +
 +  * Merge musescore2 (2.3.2+dfsg3-8) wtf; urgency=low
 +    - Bump Policy (nothing relevant), debhelper
 +    - Remove dependencies on Qt SQL library which are unneeded
 +    - Fix DEP 5 format: repacking notice must be in Source, not a Comment
 +    - Update patches (forwarding information / releases fixed)
 +    - Drop home-grown umask fixup code, dh does this nowadays
 +    - Use dh’s new execute_{before,after}_* overrides
 +    - Work around #796257 to fix Debian reproducible builds
 +    - Don’t show irrelevant Qt5 deprecation warnings; upstream’s to fix
 +    - Forward and apply fixes by lintian
 +  * Add some patches from upstream:
 +    - Fix warning when loading custom workspaces
 +    - Allow building against Qt 5.14 (Closes: #964641)
 +    - Fix rendering of emboldened fonts
 +    - Numerous crash, playback, layout and other bugfixes
 +  * Update copyright info (Debian and patches from upstream/submissions)
 +    - a new CLA seems to be used since 2019…
++  * SMuFL: fix typo
 +
-  -- Thorsten Glaser <tg@mirbsd.de>  Sun, 26 Jul 2020 00:08:27 +0200
++ -- Thorsten Glaser <tg@mirbsd.de>  Thu, 30 Jul 2020 20:24:17 +0200
 +
 +musescore (3.2.3+dfsg1-4) unstable; urgency=medium
 +
 +  * Apply workaround for broken directory bookmarks in file dialogue
 +  * (Yes I know 3.3’s out, I will be packaging it shortly)
 +  * Merge musescore2 (2.3.2+dfsg3-7) wtf; urgency=low
 +  * Upload to sid again without the revert restriking patch
 +  * Add new features from 3.2 to the package description
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Sun, 10 Nov 2019 22:54:07 +0100
 +
 +musescore (3.2.3+dfsg1-3exp1) experimental; urgency=medium
 +
 +  * Upload to experimental, again with the revert restriking patch
 +  * Use the Debian packaging of freefont, do not bundle it
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Wed, 30 Oct 2019 15:37:20 +0100
 +
 +musescore (3.2.3+dfsg1-3) unstable; urgency=high
 +
 +  * Fix crash on reading preferences files containing unrecognised
 +    entries (such as these from a later otherwise compatible version)
 +  * Update lintian override: a false positive is no longer present
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Wed, 30 Oct 2019 15:36:22 +0100
 +
 +musescore (3.2.3+dfsg1-2exp1) experimental; urgency=low
 +
 +  * Upload to experimental, again with the revert restriking patch
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Mon, 30 Sep 2019 02:32:24 +0200
 +
 +musescore (3.2.3+dfsg1-2) unstable; urgency=low
 +
 +  * Upload to unstable, again without the restriking patch
 +  * Merge musescore (3.2.3+dfsg1-1exp1) experimental; urgency=low
 +    - pull another post-release bugfix from upstream
 +  * Set umask 022 for reproducibility
 +  * Merge musescore2 (2.3.2+dfsg3-6) wtf; urgency=low
 +    - updates d/copyright with more historic info + formatting
 +    - modernising and correcing packaging
 +    - runs test in UTF-8 locale, lile build
 +    - add -g3 to optdbg builds
 +    - Policy 4.4.1 (no changes)
 +  * Fix misspelt translation
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Mon, 30 Sep 2019 01:18:56 +0200
 +
 +musescore (3.2.3+dfsg1-1exp1) experimental; urgency=low
 +
 +  * Upload to experimental, again with the revert restriking patch
 +  * Pull another post-release bugfix from upstream
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Wed, 10 Jul 2019 18:57:24 +0200
 +
 +musescore (3.2.3+dfsg1-1) unstable; urgency=low
 +
 +  * Fix About when build number is empty (cosmetic)
 +  * Merge musescore2 (2.3.2+dfsg3-5) wtf; urgency=low
 +  * New upstream release
 +  * Upload to unstable, with the revert restriking patch disabled
 +  * Fix building with disabled plugins (needed to build on stretch)
 +  * Small cosmetic fix for About dialogue and --long-version
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Wed, 10 Jul 2019 03:22:28 +0200
 +
 +musescore (3.2.2+dfsg1-1) experimental; urgency=medium
 +
 +  * New upstream release
 +  * Merge musescore-snapshot (3.1+dfsg1-1) experimental; urgency=medium
 +  * Drop merged patches, update patches
 +  * Merge musescore2 (2.3.2+dfsg3-4) wtf; urgency=low
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Thu, 04 Jul 2019 23:55:01 +0200
 +
 +musescore-snapshot (3.1+dfsg1-1) experimental; urgency=medium
 +
 +  * New upstream release, repackaged as snapshot for integration work
 +  * Apply four post-release bugfixes: three from master, one from the
 +    musescore.com backend branch that’s not… yet(?) there
 +  * Update description with new features from 3.0 and 3.1
 +  * Merge musescore2 (2.3.2+dfsg3-2) wtf; urgency=medium
 +  * Supplement the AppStream metadata with the new release
 +  * Fix charset used by local plugin docs
 +  * Register plugin documentation with doc-base
 +  * Note known bug https://musescore.org/en/node/290147
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Mon, 03 Jun 2019 23:42:38 +0200
 +
 +musescore-snapshot (3.1~pre20190412+dfsg1-1) experimental; urgency=low
 +
 +  * New upstream snapshot “v3.1beta”
 +  * Merge musescore (3.0.5+dfsg1-2) experimental; urgency=low
 +  * Generate and install full plugin documentation locally
 +  * Merge musescore (3.0.5+dfsg1-3) experimental; urgency=low
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Fri, 19 Apr 2019 22:24:42 +0200
 +
 +musescore-snapshot (3.1~pre20190227+dfsg1-1) experimental; urgency=low
 +
 +  * Revert to tracking “git master” snapshots now 3.0.x was branched
 +  * New upstream snapshot; drop applied and refresh remaining patches
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Wed, 27 Feb 2019 21:01:07 +0100
 +
 +musescore (3.0.5+dfsg1-3) experimental; urgency=low
 +
 +  * Merge musescore (2.3.2+dfsg2-6) unstable; urgency=medium
 +  * Mark more patches as applied upstream
 +  * Adopt package description marker distinguishing from castling branch
 +  * Update AppData PR patch
 +  * Add a few crash fix patches until 3.1 is out
 +  * Clarify the Qt 5.7 patch use in stretch-backports-sloppy *only*
 +  * Apply recommended settings of debhelper 12
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Sat, 04 May 2019 01:55:53 +0200
 +
 +musescore (3.0.5+dfsg1-2) experimental; urgency=low
 +
 +  * Merge musescore (2.3.2+dfsg2-5) unstable; urgency=medium
 +  * Update patches and pull three new bugfix patches from upstream
 +  * Stop suggesting old tiny soundfonts: we pull in a suitable, large
 +    one (with better UX) already, and the user can install any SF2/SF3
 +    or SFZ one by themselves
 +  * Use the same soundfont as upstream does, for fresh installations
 +  * Workaround for DEP 5 syntax in a complex case
 +  * Fix share/plugins/notenames.qml copyright years
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Wed, 17 Apr 2019 23:33:14 +0200
 +
 +musescore (3.0.5+dfsg1-1) experimental; urgency=medium
 +
 +  * New upstream version, targetting experimental until AFTER buster release
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Wed, 13 Mar 2019 17:52:48 +0100
 +
 +musescore (3.0.4+dfsg1-1) experimental; urgency=low
 +
 +  * New upstream version, targetting experimental until AFTER buster release
 +  * Remove applied patches
 +  * Fix upstream release notes link
 +  * Apply a reproducibility fix merged in upstream 3.1
 +  * Automate skipping the testsuite for too-old Qt5, easing backports/PPA
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Thu, 07 Mar 2019 22:48:58 +0100
 +
 +musescore (3.0.3+dfsg1-1) experimental; urgency=low
 +
 +  * Merge from the musescore-snapshot package but rename it back
 +  * Rename binary packages to musescore3{,-common} for coïnstallability
 +    (musescore{,-common} 2.x will stay around for buster’s lifetime, and
 +    upstream says users should have both in parallel, for existing scores)
 +  * New upstream version, targetting experimental until AFTER buster release
 +  * Apply upstream patch to fix sound to not always be piano + some crashes
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Wed, 27 Feb 2019 20:02:56 +0100
 +
 +musescore-snapshot (3.0.2+dfsg1-3) experimental; urgency=high
 +
 +  * Backport proposed fixes for saving text colours and flipping lyrics
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Mon, 18 Feb 2019 00:34:31 +0100
 +
 +musescore-snapshot (3.0.2+dfsg1-2) experimental; urgency=medium
 +
 +  * Mark patches as applied upstream
 +  * Allow manually debugging xvfb testsuite runner
 +  * Make up a $HOME directory which the testsuite can use
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Thu, 07 Feb 2019 19:07:46 +0100
 +
 +musescore-snapshot (3.0.2+dfsg1-1) experimental; urgency=medium
 +
 +  * Fix failing tst_runscripts
 +  * Allow MuseJazz fonts back in, the source code situation was cleared
 +  * Backport another FTBFS fix
 +  * New upstream release
 +    - update copyright
 +    - refresh all patches and PRs
 +  * Fix non-constant format string (-Wformat-security)
 +  * Slight env cleanup for the tests (tbf within pbuilder)
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Wed, 06 Feb 2019 21:07:52 +0100
 +
 +musescore-snapshot (3.0.1+dfsg1-2) experimental; urgency=low
 +
 +  * Fix XDG_DATA_HOME subpath location in the manpage
 +  * Merge changes from musescore (2.3.2+dfsg2-3)
 +  * Update upstream submission status of, and the patches themselves
 +
 + -- Thorsten Glaser <tg@mirbsd.de>  Sun, 27 Jan 2019 17:06:00 +0100
 +
 +musescore2 (2.3.2+dfsg3-9) UNRELEASED; urgency=medium
  
    * Quieten another G++ warning that upstream should fix
-  -- Thorsten Glaser <tg@mirbsd.de>  Thu, 30 Jul 2020 16:55:59 +0200
+   * Fix SMuFL typo
+   * Apply some upstream/backported patches:
+     - Synthesiser: char vs signed char mismatch
+     - Pianoroll: don’t store redundant/default values in XML
+     - ottava font too big
+     - Preferences: radio buttons for sound in dialogue
+     - bad octave for B♯ and C♭
+     - Desktop file: StartupWMClass to allow icon grouping
+  -- Thorsten Glaser <tg@mirbsd.de>  Thu, 30 Jul 2020 20:07:56 +0200
  
  musescore2 (2.3.2+dfsg3-8) wtf; urgency=low
  
index c718de8,0000000..1f09a55
mode 100644,000000..100644
--- /dev/null
@@@ -1,8 -1,0 +1,5 @@@
- # cf. https://github.com/w3c/smufl/issues/127
- musescore3: spelling-error-in-binary usr/bin/mscore3 follwed followed
 +# cf. https://github.com/w3c/smufl/issues/74#issuecomment-320513315
 +musescore3: spelling-error-in-binary usr/bin/mscore3 possibile possible
 +
 +# available in the musescore3-common binary package
 +musescore3: no-upstream-changelog
index 0000000,0155df9..ce2d8d3
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,38 +1,27 @@@
 ---- a/fonts/bravura/glyphnames.json
 -+++ b/fonts/bravura/glyphnames.json
 -@@ -7269,7 +7269,7 @@
 -     }, 
 -     "ornamentPrecompPortDeVoixMordent": {
 -         "codepoint": "U+E5BC", 
 --        "description": "Pre-beat port de voix follwed by multiple mordent (Dandrieu)"
 -+        "description": "Pre-beat port de voix followed by multiple mordent (Dandrieu)"
 -     }, 
 -     "ornamentPrecompSlide": {
 -         "codepoint": "U+E5B0", 
 ---- a/fonts/gootville/glyphnames.json
 -+++ b/fonts/gootville/glyphnames.json
 -@@ -7142,7 +7142,7 @@
+ Description: Fix typo in SMuFL metadata
+ Bug-SMuFL: https://github.com/w3c/smufl/issues/127
+ From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
+ Forwarded: https://github.com/w3c/smufl/pull/129
 -@@ -4306,7 +4306,7 @@ QVector<QString> Sym::symUserNames = {
++--- a/fonts/smufl/glyphnames.json
+++++ b/fonts/smufl/glyphnames.json
++@@ -7725,7 +7725,7 @@
+      }, 
+      "ornamentPrecompPortDeVoixMordent": {
+          "codepoint": "U+E5BC", 
+ -        "description": "Pre-beat port de voix follwed by multiple mordent (Dandrieu)"
+ +        "description": "Pre-beat port de voix followed by multiple mordent (Dandrieu)"
+      }, 
+      "ornamentPrecompSlide": {
+          "codepoint": "U+E5B0", 
+ --- a/libmscore/sym.cpp
+ +++ b/libmscore/sym.cpp
 -       "Mordent with upper prefix",
++@@ -4572,7 +4572,7 @@ const std::array<const char*, int(SymId:
+        "Inverted mordent with upper prefix",
+        "Mordent with release",
 -       "Slide",
++       QT_TRANSLATE_NOOP("symUserNames", "Mordent with upper prefix"),
+ -      "Pre-beat port de voix follwed by multiple mordent (Dandrieu)",
+ +      "Pre-beat port de voix followed by multiple mordent (Dandrieu)",
++       QT_TRANSLATE_NOOP("symUserNames", "Slide"),
+        "Slide-trill with two-note suffix (J.S. Bach)",
+        "Slide-trill (D'Anglebert)",
@@@ -4,80 -4,28 +4,81 @@@ debian-specific/debundle-openssl.dif
  debian-specific/debundle-fonts.diff
  debian-specific/kfreebsd-oss-salsa.diff
  debian-specific/version-dialogue.diff
 -upstream/lyrics-hyphen-syllable-closer.diff
 -upstream/mscx-reproducible-save-chordlist.diff
 -upstream/save-locale-dependent-preferences.diff
 -upstream/testsuite.diff
 -upstream/better-batch-convert.diff
 -upstream/new-manpage.diff
 -upstream/mtest-fix-freetype-includes.diff
 -upstream/note-accessibleInfo-const.diff
 +debian-specific/local-docs.diff
 +debian-specific/fixup-AppData.diff
  upstream/file-dialogues.diff
 -upstream/update-AppData.diff
 +upstream/untranslatable-error-msg.diff
 +upstream/fix-cli-audio.diff
 +upstream/fix-pluginless-build.diff
 +upstream/undoable-spacer-drag-length.diff
 +upstream/workspace-crash.diff
 +backports/workspace-warning.diff
 +backports/qt514-1.diff
 +backports/boldfonts-1.diff
 +backports/boldfonts-2.diff
 +backports/boldfonts-3.diff
 +backports/01-playback-muted.diff
 +backports/02-playback-tied.diff
 +backports/03-playback-deleted.diff
 +backports/04-paste-breath.diff
 +backports/05-layout-hairpin-dynamic.diff
 +backports/06-layout-volta.diff
 +backports/07-layout-clef-change.diff
 +backports/09-layout-1st-system.diff
 +backports/10-ui-undo-track.diff
 +backports/11-ui-keys-move.diff
 +backports/14-crash-segments.diff
 +backports/15-crash-mxml.diff
 +backports/16-crash-workspace.diff
 +backports/16a-crash-qt514.diff
 +backports/17-crash-tremolo.diff
 +backports/18-crash-pianoroll.diff
 +backports/19-synth-state.diff
 +backports/20-tour-loop.diff
- backports/21-synth-signed-char.diff
+ upstream/synth-glitches.diff
 +backports/22-crash-fermata.diff
 +backports/24-element-size.diff
 +backports/25-relayout-beams.diff
 +backports/26-crash-repeats.diff
 +backports/27-font-style.diff
 +backports/28-crash-del-stafftypechange.diff
 +backports/29-layout-barno-break.diff
 +backports/30-playback-fermata.diff
 +backports/31-ui-enter-slur.diff
 +backports/32-ui-enter-timesig.diff
 +backports/33-playback-articulations.diff
 +backports/33a-playback-articulations.diff
 +backports/34-crash-drag.diff
 +backports/35-ui-mixer-reset.diff
 +backports/36-plugin-state.diff
 +backports/37-crash-parts.diff
 +backports/38-ui-units.diff
 +backports/39-layout-spacer.diff
 +backports/40-crash-del-hbox.diff
 +backports/41-crash-triplet.diff
 +backports/43-playback-glitches.diff
- backports/45-pianoroll-xml.diff
+ upstream/save-no-redundant.diff
 +backports/46-ui-ambitus.diff
 +backports/47-ui-ambitus.diff
- backports/48-layout-ottava.diff
+ upstream/ottava-size.diff
 +backports/49-pitch-ottava.diff
 +backports/50-layout-divider.diff
 +backports/51-paste-hairpin.diff
 +backports/52-ui-enter-whole-note.diff
- backports/53-ui-wtf.diff
- backports/54-pitch-Cb.diff
+ upstream/prefs-radio.diff
+ upstream/pitch-Cb-B#.diff
 +backports/55-layout-timesig.diff
 +backports/56-layout-spatium.diff
 +backports/57-crash-fontname.diff
 +backports/58-blank-lines.diff
 +backports/58b-empty-lines.diff
 +backports/59-blank-lines.diff
backports/61-desktopfile.diff
upstream/wmclass.diff
 -debian-specific/fixup-AppData.diff
 -experiments/upstream-backend-fixes.diff
 -experiments/lyrics-hyphen-max-8sp.diff
 -experiments/musescore-2.1.0-qt-5.12.patch
 +backports/62-measure-count.diff
 +backports/63-minimise-window.diff
  experiments/statusline-concert-transposing-pitch.diff
  experiments/element-barbeat.diff
+ experiments/smufl-typo.diff
  experiments/revert-restriking-patch.diff
  experiments/log-collisions.diff
 +#debian-specific/qt-5.7.diff
diff --cc debian/rules
Simple merge