Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package musescore
This upload addresses two issues which, while minor, I would
appreciate having fixed before stable:
* The recent ftpmaster re-review in experimental found missing
authorship attributions in d/copyright which (inherited from
the previous maintainers) affect the version in testing/sid,
which I fixed there.
* The patch debian/patches/experiments/new-manpage.diff was
since accepted upstream, although upstream review has found
a mistake (XDG_DOCUMENTS_DIR was missing from the path in
which the user-generated documents are stored, potentially
misleading users, which is why I ask for inclusion); the
change also records the merging in the DEP 3 headers and
makes it otherwise identical to the version that was actually
merged upstream (copyright year/date changed to encompass
2019 as well; the “cd” to the directory in the script, which
is not called during the build (only for developers) and so
does not change anything) for consistence.
I have “sat” on these changes for a while though, until it became
clear that my current git hosting platform is not affected by the
dreaded “Article 13” and so I do not have to change VCS-* _again_
(otherwise I’d have included this here, too). I hope that’s okay.
This was uploaded yesterday, and I’ve tested it (on x32), but if
it should sit in sid for a bit longer, that’s no problem either.
Extra benefit: the packages are now rebuilt against latest Qt,
which had uploads recently. (Should not change anything, though.)
The full debdiff is really trivial and follows:
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:11:13.000000000
+0100
+++ musescore-2.3.2+dfsg2/debian/changelog 2019-04-16 15:34:28.000000000
+0200
@@ -1,3 +1,19 @@
+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 <t...@mirbsd.de> Tue, 16 Apr 2019 15:34:28 +0200
+
musescore (2.3.2+dfsg2-4) unstable; urgency=low
* Mark some patches as applied upstream
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:11:13.000000000
+0100
+++ musescore-2.3.2+dfsg2/debian/copyright 2019-04-16 15:33:48.000000000
+0200
@@ -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 <f...@kokkinizita.net>
License: GPL-2+
+Files: aeolus/global.h
+Copyright: 2003-2010, Fons Adriaensen <f...@kokkinizita.net>
+ 2008, Hans Fugal <h...@fugal.net>
+License: GPL-2+
+
Files: awl/fastlog.h
Copyright: Laurent de Soras <laur...@ohmforce.com>
License: WTFPL-2
@@ -90,6 +94,13 @@
Copyright: QT-CI Project <https://github.com/benlau/qtci>
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:11:13.000000000 +0100
+++ musescore-2.3.2+dfsg2/debian/patches/experiments/new-manpage.diff
2019-04-16 15:20:21.000000000 +0200
@@ -3,10 +3,11 @@
Author: mirabilos <t...@debian.org>
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 <m...@mirbsd.org>
+.\" 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=''
unblock musescore/2.3.2+dfsg2-5
-- System Information:
Debian Release: buster/sid
APT prefers unreleased
APT policy: (500, 'unreleased'), (500, 'buildd-unstable'), (500, 'unstable')
Architecture: x32 (x86_64)
Foreign Architectures: i386, amd64
Kernel: Linux 4.19.0-4-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_FIRMWARE_WORKAROUND
Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=C (charmap=UTF-8)
Shell: /bin/sh linked to /bin/lksh
Init: sysvinit (via /sbin/init)
