diff -Nru musescore-3.2.3+dfsg1/debian/changelog musescore-3.2.3+dfsg1/debian/changelog --- musescore-3.2.3+dfsg1/debian/changelog 2019-09-30 00:45:06.000000000 +0000 +++ musescore-3.2.3+dfsg1/debian/changelog 2019-11-10 22:47:15.000000000 +0000 @@ -1,4 +1,44 @@ -musescore (3.2.3+dfsg1-2~ppa1904+1) disco; urgency=low +musescore (3.2.3+dfsg1-4~ppa1904+1) disco; urgency=high + + * Rebuild for PPA (LTS 1804; others best-effort) + * Remaining changes from bullseye/sid: + - Use debhelper 11 + - VCS-* branch adjustment + + -- Thorsten Glaser Sun, 10 Nov 2019 23:47:15 +0100 + +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 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 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 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 Mon, 30 Sep 2019 02:32:24 +0200 + +musescore (3.2.3+dfsg1-2~ppa1804+1) bionic; urgency=low * Rebuild for PPA (LTS 1804; others best-effort) * Remaining changes from bullseye/sid: @@ -226,6 +266,17 @@ -- Thorsten Glaser Sun, 27 Jan 2019 17:06:00 +0100 +musescore2 (2.3.2+dfsg3-7) wtf; urgency=low + + * Add some more (minor) upstream patches + * Apply workaround for broken directory bookmarks in file dialogue + * Use the Debian freefont packaging instead of bundling it + * Drop false positive from lintian overrides as it’s gone + * Add Depends, Recommends to B-D, so uninstallability is noticed + * Lower pulseaudio-utils to merely Suggests + + -- Thorsten Glaser Sun, 10 Nov 2019 22:24:16 +0100 + musescore2 (2.3.2+dfsg3-6) wtf; urgency=low * d/copyright: Update MuseJazz information from historic records diff -Nru musescore-3.2.3+dfsg1/debian/control musescore-3.2.3+dfsg1/debian/control --- musescore-3.2.3+dfsg1/debian/control 2019-09-30 00:44:19.000000000 +0000 +++ musescore-3.2.3+dfsg1/debian/control 2019-11-10 22:46:31.000000000 +0000 @@ -4,16 +4,24 @@ Maintainer: Thorsten Glaser Homepage: https://musescore.org/en Build-Depends: debhelper-compat (= 11), -# # for the tests (but useful to ensure installability before building) +# # for the tests # imagemagick, mksh, + xauth, + xvfb, +# # testsuite and runtime + desktop-file-utils, + fonts-freefont-ttf, + libmp3lame0, + libqt5sql5-sqlite, + musescore-general-soundfont-small | musescore-compatible-soundfont, qml-module-qtquick-controls, qml-module-qtquick-dialogs, qml-module-qtquick-layouts, qml-module-qtquick2, - xauth, - xvfb, -# # to build + shared-mime-info, + xdg-utils, +# # build cmake, doxygen, g++ (>= 4:4.8), @@ -71,6 +79,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils, + fonts-freefont-ttf, libqt5sql5-sqlite, qml-module-qtquick-controls, qml-module-qtquick-dialogs, @@ -81,7 +90,8 @@ # # dependent on MSCORE_INSTALL_SUFFIX from debian/rules # # and MUSESCORE_VERSION_{MAJOR,MINOR} from CMakeLists.txt musescore3-common (>> 3.2~), musescore3-common (<< 3.3~) -Recommends: libmp3lame0, pulseaudio-utils +Recommends: libmp3lame0 +Suggests: pulseaudio-utils Description: cross-platform multi-lingual music composition and notation MuseScore is an Open Source (GNU GPL) music notation software that runs on all platforms supported by Qt5 (GNU/Linux, MacOS X, Windows), and is @@ -126,6 +136,7 @@ - mixer for instrument levels and effects - mixing and panning for individual parts - percussion notation + - sticking (“fingering” for drummers) - early music notation - cross-staff beaming - import of graphics diff -Nru musescore-3.2.3+dfsg1/debian/copyright musescore-3.2.3+dfsg1/debian/copyright --- musescore-3.2.3+dfsg1/debian/copyright 2019-09-30 00:43:43.000000000 +0000 +++ musescore-3.2.3+dfsg1/debian/copyright 2019-11-10 22:46:02.000000000 +0000 @@ -5,6 +5,7 @@ Copyright: 2002-2019, Werner Schweer and others License: GPL-2 with Font exception (MuseScore) Files-Excluded: *.pdf + fonts/campania share/sound thirdparty/freetype thirdparty/libcrashreporter-qt diff -Nru musescore-3.2.3+dfsg1/debian/musescore3.lintian-overrides musescore-3.2.3+dfsg1/debian/musescore3.lintian-overrides --- musescore-3.2.3+dfsg1/debian/musescore3.lintian-overrides 2019-09-29 23:04:22.000000000 +0000 +++ musescore-3.2.3+dfsg1/debian/musescore3.lintian-overrides 2019-11-10 22:46:02.000000000 +0000 @@ -1,11 +1,5 @@ # cf. https://github.com/w3c/smufl/issues/74#issuecomment-320513315 musescore3: spelling-error-in-binary usr/bin/mscore3 possibile possible -# false positive -musescore3: spelling-error-in-binary usr/bin/mscore3 LaOd Load - -# part of OpenType font embedded in the binary -musescore3: spelling-error-in-binary usr/bin/mscore3 pres press - # available in the musescore3-common binary package musescore3: no-upstream-changelog diff -Nru musescore-3.2.3+dfsg1/debian/patches/debian-specific/debundle-fonts.diff musescore-3.2.3+dfsg1/debian/patches/debian-specific/debundle-fonts.diff --- musescore-3.2.3+dfsg1/debian/patches/debian-specific/debundle-fonts.diff 1970-01-01 00:00:00.000000000 +0000 +++ musescore-3.2.3+dfsg1/debian/patches/debian-specific/debundle-fonts.diff 2019-11-10 22:46:02.000000000 +0000 @@ -0,0 +1,38 @@ +Description: Don’t bundle fonts-freefont-ttf in the executable, + use the system copy (even if this means rendering will differ + from other places and musescore.com, the local user will get + the bugfixes applied to the Debian packaging of said fonts) + . + This was discussed around the Campania debate; basically, both + embedding and depending have upsides and downsides… ☹ +Author: mirabilos +Forwarded: not-needed +Justification: distribution-specific packaging + +--- a/libmscore/mscore.cpp ++++ b/libmscore/mscore.cpp +@@ -347,11 +347,13 @@ void MScore::init() + #if !defined(Q_OS_MAC) && !defined(Q_OS_IOS) + static const char* fonts[] = { + ":/fonts/musejazz/MuseJazzText.otf", ++#if 0 + ":/fonts/FreeSans.ttf", + ":/fonts/FreeSerif.ttf", + ":/fonts/FreeSerifBold.ttf", + ":/fonts/FreeSerifItalic.ttf", + ":/fonts/FreeSerifBoldItalic.ttf", ++#endif + ":/fonts/mscoreTab.ttf", + ":/fonts/mscore-BC.ttf", + ":/fonts/bravura/BravuraText.otf", +--- a/mscore/CMakeLists.txt ++++ b/mscore/CMakeLists.txt +@@ -207,8 +207,6 @@ else (APPLE) + musescorefonts-Gootville.qrc + musescorefonts-Bravura.qrc + musescorefonts-MuseJazz.qrc +- musescorefonts-FreeSerif.qrc +- musescorefonts-Free.qrc + shortcut.qrc) + endif (APPLE) + diff -Nru musescore-3.2.3+dfsg1/debian/patches/experiments/file-dialogues.diff musescore-3.2.3+dfsg1/debian/patches/experiments/file-dialogues.diff --- musescore-3.2.3+dfsg1/debian/patches/experiments/file-dialogues.diff 1970-01-01 00:00:00.000000000 +0000 +++ musescore-3.2.3+dfsg1/debian/patches/experiments/file-dialogues.diff 2019-11-10 22:46:02.000000000 +0000 @@ -0,0 +1,29 @@ +Description: fix #292912: use native file dialogues by default also on Linux +Author: mirabilos +Forwarded: https://github.com/musescore/MuseScore/pull/5461 + +--- a/mscore/preferences.cpp ++++ b/mscore/preferences.cpp +@@ -48,13 +48,6 @@ void Preferences::init(bool storeInMemor + bool checkExtensionsUpdateStartup = false; + #endif + +-#if defined(Q_OS_MAC) || defined(Q_OS_WIN) +- // use system native file dialogs +- // Qt file dialog is very slow on Windows and Mac +- bool nativeDialogs = true; +-#else +- bool nativeDialogs = false; // don't use system native file dialogs +-#endif + bool defaultUsePortAudio = false; + bool defaultUsePulseAudio = false; + bool defaultUseJackAudio = false; +@@ -173,7 +166,7 @@ void Preferences::init(bool storeInMemor + {PREF_UI_APP_RASTER_HORIZONTAL, new IntPreference(2)}, + {PREF_UI_APP_RASTER_VERTICAL, new IntPreference(2)}, + {PREF_UI_APP_SHOWSTATUSBAR, new BoolPreference(true)}, +- {PREF_UI_APP_USENATIVEDIALOGS, new BoolPreference(nativeDialogs)}, ++ {PREF_UI_APP_USENATIVEDIALOGS, new BoolPreference(true)}, + {PREF_UI_PIANO_HIGHLIGHTCOLOR, new ColorPreference(QColor("#1259d0"))}, + {PREF_UI_SCORE_NOTE_DROPCOLOR, new ColorPreference(QColor("#1778db"))}, + {PREF_UI_SCORE_DEFAULTCOLOR, new ColorPreference(QColor("#000000"))}, diff -Nru musescore-3.2.3+dfsg1/debian/patches/series musescore-3.2.3+dfsg1/debian/patches/series --- musescore-3.2.3+dfsg1/debian/patches/series 2019-09-30 00:43:43.000000000 +0000 +++ musescore-3.2.3+dfsg1/debian/patches/series 2019-11-10 22:46:02.000000000 +0000 @@ -1,5 +1,6 @@ debian-specific/dfsg-exclusions.diff debian-specific/debundle-openssl.diff +debian-specific/debundle-fonts.diff debian-specific/kfreebsd-oss-salsa.diff debian-specific/version-dialogue.diff debian-specific/local-docs.diff @@ -8,6 +9,8 @@ upstream/fix-cli-audio.diff upstream/fix-pluginless-build.diff upstream/undoable-spacer-drag-length.diff +upstream/workspace-crash.diff +experiments/file-dialogues.diff experiments/statusline-concert-transposing-pitch.diff experiments/element-barbeat.diff #experiments/revert-restriking-patch.diff diff -Nru musescore-3.2.3+dfsg1/debian/patches/upstream/untranslatable-error-msg.diff musescore-3.2.3+dfsg1/debian/patches/upstream/untranslatable-error-msg.diff --- musescore-3.2.3+dfsg1/debian/patches/upstream/untranslatable-error-msg.diff 2019-09-30 00:43:43.000000000 +0000 +++ musescore-3.2.3+dfsg1/debian/patches/upstream/untranslatable-error-msg.diff 2019-11-10 22:46:02.000000000 +0000 @@ -6,7 +6,7 @@ --- a/libmscore/mscore.cpp +++ b/libmscore/mscore.cpp -@@ -419,7 +419,7 @@ const char* MScore::errorMessage() +@@ -421,7 +421,7 @@ const char* MScore::errorMessage() if (e.no == _error) return e.txt; } diff -Nru musescore-3.2.3+dfsg1/debian/patches/upstream/workspace-crash.diff musescore-3.2.3+dfsg1/debian/patches/upstream/workspace-crash.diff --- musescore-3.2.3+dfsg1/debian/patches/upstream/workspace-crash.diff 1970-01-01 00:00:00.000000000 +0000 +++ musescore-3.2.3+dfsg1/debian/patches/upstream/workspace-crash.diff 2019-11-10 22:46:02.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Fix a crash on reading a workspace with non-existing preferences +Author: Dmitri Ovodok +Origin: vendor, commit:b9bb0ceb8223866f5b60f4d821b5b3544ffa4788 +Applied-Upstream: master, commit:6c0bef1 + +--- a/mscore/preferences.cpp ++++ b/mscore/preferences.cpp +@@ -226,7 +226,7 @@ QVariant Preferences::defaultValue(const + { + checkIfKeyExists(key); + Preference* pref = _allPreferences.value(key); +- return pref->defaultValue(); ++ return pref ? pref->defaultValue() : QVariant(); + } + + QSettings* Preferences::settings() const