diff -Nru musescore2-2.3.2+dfsg3/debian/changelog musescore2-2.3.2+dfsg3/debian/changelog --- musescore2-2.3.2+dfsg3/debian/changelog 2019-09-29 21:25:31.000000000 +0000 +++ musescore2-2.3.2+dfsg3/debian/changelog 2019-11-10 22:32:16.000000000 +0000 @@ -1,9 +1,19 @@ -musescore2 (2.3.2+dfsg3-6~ppa1904+1) disco; urgency=low +musescore2 (2.3.2+dfsg3-7~ppa1904+1) disco; urgency=high - * Rebuild for 18.04 LTS, (best-effort) 19.04, 19.10 - * For bionic lower debhelper to 11 + * Rebuild for 18.04 LTS, (best-effort) 19.04, 19.10, 20.04 - -- Thorsten Glaser Sun, 29 Sep 2019 23:25:31 +0200 + -- Thorsten Glaser Sun, 10 Nov 2019 23:32:16 +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 diff -Nru musescore2-2.3.2+dfsg3/debian/control musescore2-2.3.2+dfsg3/debian/control --- musescore2-2.3.2+dfsg3/debian/control 2019-09-29 21:20:11.000000000 +0000 +++ musescore2-2.3.2+dfsg3/debian/control 2019-11-10 22:32:16.000000000 +0000 @@ -4,16 +4,24 @@ Maintainer: Thorsten Glaser Homepage: https://musescore.org/en Build-Depends: debhelper-compat (= 12), -# # 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, g++ (>= 4:4.8), libasound2-dev, @@ -68,6 +76,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, @@ -78,7 +87,8 @@ # # dependent on MSCORE_INSTALL_SUFFIX from debian/rules # # and MUSESCORE_VERSION_{MAJOR,MINOR} from CMakeLists.txt musescore-common (>> 2.3~), musescore-common (<< 2.4~) -Recommends: libmp3lame0, pulseaudio-utils +Recommends: libmp3lame0 +Suggests: pulseaudio-utils Description: cross-platform multi-lingual music composition and notation (old) 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 diff -Nru musescore2-2.3.2+dfsg3/debian/copyright musescore2-2.3.2+dfsg3/debian/copyright --- musescore2-2.3.2+dfsg3/debian/copyright 2019-09-29 21:20:11.000000000 +0000 +++ musescore2-2.3.2+dfsg3/debian/copyright 2019-11-10 22:29:38.000000000 +0000 @@ -5,6 +5,7 @@ Copyright: 2002-2018, Werner Schweer and others License: GPL-2 with Font exception (MuseScore) Files-Excluded: *.pdf + fonts/campania omr rdoc share/sound diff -Nru musescore2-2.3.2+dfsg3/debian/musescore.lintian-overrides musescore2-2.3.2+dfsg3/debian/musescore.lintian-overrides --- musescore2-2.3.2+dfsg3/debian/musescore.lintian-overrides 2019-09-29 17:13:17.000000000 +0000 +++ musescore2-2.3.2+dfsg3/debian/musescore.lintian-overrides 2019-11-10 22:29:38.000000000 +0000 @@ -1,11 +1,5 @@ # cf. https://github.com/w3c/smufl/issues/74#issuecomment-320513315 musescore: spelling-error-in-binary usr/bin/mscore possibile possible -# false positive -musescore: spelling-error-in-binary usr/bin/mscore LaOd Load - -# part of OpenType font embedded in the binary -musescore: spelling-error-in-binary usr/bin/mscore pres press - # available in the musescore-common binary package musescore: no-upstream-changelog diff -Nru musescore2-2.3.2+dfsg3/debian/patches/debian-specific/debundle-fonts.diff musescore2-2.3.2+dfsg3/debian/patches/debian-specific/debundle-fonts.diff --- musescore2-2.3.2+dfsg3/debian/patches/debian-specific/debundle-fonts.diff 1970-01-01 00:00:00.000000000 +0000 +++ musescore2-2.3.2+dfsg3/debian/patches/debian-specific/debundle-fonts.diff 2019-11-10 22:29:38.000000000 +0000 @@ -0,0 +1,40 @@ +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 +@@ -204,11 +204,13 @@ void MScore::init() + #if !defined(Q_OS_MAC) && !defined(Q_OS_IOS) + static const char* fonts[] = { + ":/fonts/MuseJazz.ttf", ++#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 +@@ -136,9 +136,7 @@ else (APPLE) + musescorefonts-MScore.qrc + musescorefonts-Gootville.qrc + musescorefonts-Bravura.qrc +- musescorefonts-MuseJazz.qrc +- musescorefonts-FreeSerif.qrc +- musescorefonts-Free.qrc) ++ musescorefonts-MuseJazz.qrc) + endif (APPLE) + + diff -Nru musescore2-2.3.2+dfsg3/debian/patches/experiments/file-dialogues.diff musescore2-2.3.2+dfsg3/debian/patches/experiments/file-dialogues.diff --- musescore2-2.3.2+dfsg3/debian/patches/experiments/file-dialogues.diff 1970-01-01 00:00:00.000000000 +0000 +++ musescore2-2.3.2+dfsg3/debian/patches/experiments/file-dialogues.diff 2019-11-10 22:29:38.000000000 +0000 @@ -0,0 +1,21 @@ +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 +@@ -200,13 +200,8 @@ void Preferences::init() + + MScore::setHRaster(2); // _spatium / value + MScore::setVRaster(2); +-#if defined(Q_OS_MAC) || defined(Q_OS_WIN) +- // use system native file dialogs +- // Qt file dialog is very slow on Windows and Mac ++ + nativeDialogs = true; +-#else +- nativeDialogs = false; // don't use system native file dialogs +-#endif + exportAudioSampleRate = 44100; + exportMp3BitRate = 128; + diff -Nru musescore2-2.3.2+dfsg3/debian/patches/experiments/upstream-backend-fixes.diff musescore2-2.3.2+dfsg3/debian/patches/experiments/upstream-backend-fixes.diff --- musescore2-2.3.2+dfsg3/debian/patches/experiments/upstream-backend-fixes.diff 1970-01-01 00:00:00.000000000 +0000 +++ musescore2-2.3.2+dfsg3/debian/patches/experiments/upstream-backend-fixes.diff 2019-11-10 22:29:38.000000000 +0000 @@ -0,0 +1,37 @@ +# DP: some changes from the branch upstream/musescore_232_go_backend +# DP: up to commit 24f97154cc114599a61a1307b8848bb9d336c0d0 +# DP: but without the experimental exports for musescore.com + +--- a/libmscore/score.cpp ++++ b/libmscore/score.cpp +@@ -4051,6 +4051,8 @@ int Score::keysig() + int Score::duration() + { + updateRepeatList(true); ++ if (repeatList()->isEmpty()) ++ return 0; + RepeatSegment* rs = repeatList()->last(); + return lrint(utick2utime(rs->utick + rs->len())); + } +--- a/libmscore/sym.cpp ++++ b/libmscore/sym.cpp +@@ -5452,7 +5452,7 @@ void initScoreFonts() + int error = FT_Init_FreeType(&ftlib); + if (!ftlib || error) + qFatal("init freetype library failed"); +- qDebug("initScoreFonts %p", ftlib); ++ //qDebug("initScoreFonts %p", ftlib); + int index = 0; + for (auto i : Sym::symNames) + Sym::lnhash.insert(i, SymId(index++)); +--- a/libmscore/undo.cpp ++++ b/libmscore/undo.cpp +@@ -1685,7 +1685,7 @@ RemoveElement::RemoveElement(Element* e) + void RemoveElement::cleanup(bool undo) + { + if (undo) { +- qDebug("RemoveElement::cleanup: delete %d %s", undo, element->name()); ++ //qDebug("RemoveElement::cleanup: delete %d %s", undo, element->name()); + delete element; + element = 0; + } diff -Nru musescore2-2.3.2+dfsg3/debian/patches/series musescore2-2.3.2+dfsg3/debian/patches/series --- musescore2-2.3.2+dfsg3/debian/patches/series 2019-09-29 21:20:11.000000000 +0000 +++ musescore2-2.3.2+dfsg3/debian/patches/series 2019-11-10 22:29:38.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 upstream/lyrics-hyphen-syllable-closer.diff @@ -12,8 +13,10 @@ upstream/note-accessibleInfo-const.diff upstream/update-AppData.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 +experiments/file-dialogues.diff experiments/statusline-concert-transposing-pitch.diff experiments/element-barbeat.diff experiments/revert-restriking-patch.diff