diff -Nru musescore-2.3.2+dfsg2/debian/changelog musescore-2.3.2+dfsg2/debian/changelog --- musescore-2.3.2+dfsg2/debian/changelog 2019-02-27 17:56:53.000000000 +0000 +++ musescore-2.3.2+dfsg2/debian/changelog 2019-04-16 20:39:24.000000000 +0000 @@ -1,4 +1,41 @@ -musescore (2.3.2+dfsg2-4~ppa1204+1) precise; urgency=low +musescore (2.3.2+dfsg2-5~ppa1204+1) precise; urgency=medium + + * Rebuild for PPA (LTS 1204, 1404, 1604, 1804; others best-effort). + * Remaining changes from stretch-backports: + - VCS-* branch adjustment + - Different testsuite exclusion reason wording + * Update VCS branch in anticipation of castling move + + -- Thorsten Glaser Tue, 16 Apr 2019 22:39:24 +0200 + +musescore (2.3.2+dfsg2-5~bpo9+1) stretch-backports; urgency=medium + + * Rebuild for stretch-backports. + * Remaining changes against buster/testing: + - Revert to debhelper 9 with explicit parallelism + - Drop R³:no for backports + - VCS-* branch adjustment + - Skip the upstream testsuite, Qt in stretch is too old + + -- Thorsten Glaser Tue, 16 Apr 2019 22:34:34 +0200 + +musescore (2.3.2+dfsg2-5) unstable; urgency=medium + + * debian/patches/experiments/new-manpage.diff: + - mark as applied upstream + - synchronise with the actually applied patch: fixes a wrong + document save directory (missing XDG_DOCUMENTS_DIR) + * debian/copyright: incorporate fixes from Debian ftptrainees: + - aeolus/global.h: also © Hans Fugal + - effects/freeverb/freeverb.{cpp,h} is a bit more complicated: + they were originally PD “Written by Jezar at Dreampoint”, + but modified by Werner who, as EU citizen, cannot relinquish + copyright, so they are, effectively, published under the same + terms as the rest of MuseScore (GPLv2); document that + + -- Thorsten Glaser Tue, 16 Apr 2019 15:34:28 +0200 + +musescore (2.3.2+dfsg2-4~ppa1804+1) bionic; urgency=low * Rebuild for PPA (LTS 1204, 1404, 1604, 1804; others best-effort). * Remaining changes from stretch-backports: diff -Nru musescore-2.3.2+dfsg2/debian/control musescore-2.3.2+dfsg2/debian/control --- musescore-2.3.2+dfsg2/debian/control 2019-02-27 17:55:11.000000000 +0000 +++ musescore-2.3.2+dfsg2/debian/control 2019-04-16 20:39:23.000000000 +0000 @@ -40,8 +40,8 @@ zlib1g-dev Standards-Version: 4.3.0 #Rules-Requires-Root: no -VCS-git: https://evolvis.org/anonscm/git/alioth/musescore.git -b ppa -VCS-Browser: https://evolvis.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=alioth/musescore.git;a=shortlog;h=refs/heads/ppa +VCS-git: https://evolvis.org/anonscm/git/alioth/musescore.git -b rochade-ppa +VCS-Browser: https://evolvis.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=alioth/musescore.git;a=shortlog;h=refs/heads/rochade-ppa Package: musescore-common Architecture: all diff -Nru musescore-2.3.2+dfsg2/debian/copyright musescore-2.3.2+dfsg2/debian/copyright --- musescore-2.3.2+dfsg2/debian/copyright 2019-02-27 17:51:49.000000000 +0000 +++ musescore-2.3.2+dfsg2/debian/copyright 2019-04-16 20:37:01.000000000 +0000 @@ -52,7 +52,6 @@ aeolus/division.cpp aeolus/division.h aeolus/exp2ap.cpp - aeolus/global.h aeolus/messages.h aeolus/model.cpp aeolus/model.h @@ -69,6 +68,11 @@ Copyright: 2003-2010, Fons Adriaensen License: GPL-2+ +Files: aeolus/global.h +Copyright: 2003-2010, Fons Adriaensen + 2008, Hans Fugal +License: GPL-2+ + Files: awl/fastlog.h Copyright: Laurent de Soras License: WTFPL-2 @@ -90,6 +94,13 @@ Copyright: QT-CI Project License: Apache-2.0 +Files: effects/freeverb/freeverb.cpp + effects/freeverb/freeverb.h +Copyright: 2009, Werner Schweer +License: Public Domain (Freeverb) and GPL-2 with Font exception (MuseScore) + Written by Jezar at Dreampoint, June 2000 + “This code is public domain” (well, it originally was) + Files: fluid/chan.cpp fluid/conv.cpp fluid/conv.h diff -Nru musescore-2.3.2+dfsg2/debian/patches/experiments/new-manpage.diff musescore-2.3.2+dfsg2/debian/patches/experiments/new-manpage.diff --- musescore-2.3.2+dfsg2/debian/patches/experiments/new-manpage.diff 2019-02-27 17:54:43.000000000 +0000 +++ musescore-2.3.2+dfsg2/debian/patches/experiments/new-manpage.diff 2019-04-16 20:37:01.000000000 +0000 @@ -3,10 +3,11 @@ Author: mirabilos Bug: https://musescore.org/en/node/277903 Forwarded: https://github.com/musescore/MuseScore/pull/4265 +Applied-Upstream: master, commit:e292cfb527 --- a/build/Linux+BSD/mscore.1.in +++ b/build/Linux+BSD/mscore.1.in -@@ -1,244 +1,505 @@ +@@ -1,244 +1,510 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" To preview the page formatting without installing use "man -l mscore.1" -.\" First parameter, NAME, should be all caps @@ -95,11 +96,11 @@ -@MAN_PORTABLE@.TP -@MAN_PORTABLE@.B man, manual, manpage +.\" New manual page for MuseScore 2.3.2 -+.\" Copyright (c) 2018 ++.\" Copyright (c) 2018, 2019 +.\" mirabilos +.\" Published under the same terms as MuseScore itself. +.\"- -+.Dd February 27, 2019 ++.Dd March 20, 2019 +.Dt @MAN_MSCORE_UPPER@ 1 +.Os MuseScore +.Sh NAME@Variables_substituted_by_CMAKE_on_installation@ @@ -589,6 +590,11 @@ +User data location; defaults to +.Pa \(ti/.local/share +if unset. ++.It Ev XDG_DOCUMENTS_DIR ++Location of works the user created with the application; defaults to ++.Pa \(ti/Documents ++(or a localised version) and can be set in ++.Pa $XDG_CONFIG_HOME/user-dirs.dirs . +.El +.Pp +Note that MuseScore also supports the normal Qt environment variables such as @@ -612,7 +618,7 @@ +.Pp +The per-user data (extensions, plugins, soundfonts, styles, templates) and +files (images, scores) are normally installed into subdirectories under -+.Pa \(ti/MuseScore2/ ++.Pa $XDG_DOCUMENTS_DIR/MuseScore2/ +but may be changed in the configuration. +Note that snapshot, alpha and beta versions use +.Pa MuseScore3Development @@ -749,9 +755,11 @@ +.Sx SEE ALSO ) . --- /dev/null +++ b/build/Linux+BSD/mscore.1.preview.sh -@@ -0,0 +1,22 @@ +@@ -0,0 +1,24 @@ +#!/bin/sh + ++cd "$(dirname "$0")" ++ +case $1 in +(portable|p) + portable=''