ensure we don’t even accidentally bundle FreeFont

document the GPLv3+FE vs. GPLv2-only situation

diff --git a/debian/changelog b/debian/changelog
index 8c708c2..3197025 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-musescore2 (2.3.2+dfsg3-12) unstable; urgency=medium
+musescore2 (2.3.2+dfsg4-12) unstable; urgency=medium
 
   * Fix CFLAGS/CXXFLAGS extras to disable upstream-only warnings
   * Update list of MScore.ttf copyright holders, again
+  * Explicitly debundle GNU FreeFont
 
- -- Thorsten Glaser <tg@mirbsd.de>  Sun, 17 Jan 2021 18:40:43 +0100
+ -- Thorsten Glaser <tg@mirbsd.de>  Sun, 31 Jan 2021 17:32:29 +0100
 
 musescore2 (2.3.2+dfsg3-11) unstable; urgency=medium
 

diff --git a/debian/copyright b/debian/copyright
index a92bb4b..6aa0174 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,16 @@ Upstream-Name: MuseScore
 Upstream-Contact: https://musescore.org/
 Source: https://github.com/musescore/MuseScore/
  PDFs and binary files removed to comply with the DFSG.
+ Fonts under GPLv3 removed as to avoid accidentally embedding them.
+ Bundled convenience copies already packaged also removed.
 Copyright: 2002-2018, Werner Schweer and others
 License: GPL-2 with Font exception (MuseScore)
 Files-Excluded: *.pdf
+                fonts/FreeSans*
+                fonts/FreeSerif*
                 fonts/campania
+                mscore/musescorefonts-Free.qrc
+                mscore/musescorefonts-FreeSerif.qrc
                 omr
                 rdoc
                 share/sound
@@ -30,7 +36,7 @@ Copyright:
  2016, James Cowgill <james410@cowgill.org.uk>
  2016, Peter Jonas <pjonas56@gmail.com>
  2018, Dr. Tobias Quathamer <toddy@debian.org>
- 2017, 2018, 2019, 2020, mirabilos <tg@debian.org>
+ 2017, 2018, 2019, 2020, 2021, mirabilos <tg@debian.org>
 License: GPL-2 with Font exception (MuseScore)
 Comment: This includes packaging (mostly trivial) and patches
  (including backports from upstream and submissions under CLA).
@@ -155,35 +161,6 @@ Copyright: 2015, Steinberg Media Technologies GmbH <http://www.steinberg.net/>,
  with Reserved Font Name "Bravura".
 License: OFL-1.1
 
-Files: fonts/FreeSans*.sfd
-       fonts/FreeSans*.ttf
-       fonts/FreeSerif*.sfd
-       fonts/FreeSerif*.ttf
-Copyright: 2002, 2003, 2005, 2008, 2009, 2010, 2012, GNU Freefont contributors.
-License: GPL-3+ with Font exception (FreeFont)
- This computer font is part of GNU FreeFont. It is free software: you can
- redistribute it and/or modify it under the terms of the GNU General
- Public License as published by the Free Software Foundation, either
- version 3 of the License, or (at your option) any later version.
- .
- This font is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- Public License for more details.
- .
- You should have received a copy of the GNU General Public License along
- with this font. If not, see <http://www.gnu.org/licenses/>.
- .
- As a special exception, if you create a document which uses this font,
- and embed this font or unaltered portions of this font into the
- document, this font does not by itself cause the resulting document to
- be covered by the GNU General Public License. This exception does not
- however invalidate any other reasons why the document might be covered
- by the GNU General Public License. If you modify this font, you may
- extend this exception to your version of the font, but you are not
- obligated to do so. If you do not wish to do so, delete this exception
- statement from your version.
-
 Files: fonts/gootville/*
 Copyright: Grzegorz Pruchniakowski
  Daniel Spreadbury at Steinberg

diff --git a/debian/patches/debian-specific/debundle-fonts.diff b/debian/patches/debian-specific/debundle-fonts.diff
index 4ee2e12..d246929 100644 (file)
--- a/debian/patches/debian-specific/debundle-fonts.diff
+++ b/debian/patches/debian-specific/debundle-fonts.diff
@@ -5,6 +5,9 @@ Description: Don’t bundle fonts-freefont-ttf in the executable,
  .
  This was discussed around the Campania debate; basically, both
  embedding and depending have upsides and downsides… ☹
+ .
+ Considering MuseScore is GPLv2 and the font is GPLv3+FE though
+ it’s safer to not embed it into the binary at all.
 Author: mirabilos <tg@debian.org>
 Forwarded: not-needed
 Justification: distribution-specific packaging
@@ -37,3 +40,14 @@ Justification: distribution-specific packaging
  endif (APPLE)
  
  
+--- a/mtest/CMakeLists.txt
++++ b/mtest/CMakeLists.txt
+@@ -29,8 +29,6 @@ QT5_ADD_RESOURCES(qrc_files ${PROJECT_SO
+             ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Gootville.qrc
+             ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Bravura.qrc
+             ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-MuseJazz.qrc
+-            ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Free.qrc
+-            ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-FreeSerif.qrc
+       )
+ 
+ add_library (testResources STATIC

diff --git a/debian/repack b/debian/repack
index f23f08b..1e2026d 100755 (executable)
--- a/debian/repack
+++ b/debian/repack
@@ -172,7 +172,7 @@ xz -7e "musescore2_$debversion.orig.tar"
 cat >&2 <<EOF
 Finished!
 The upstream code is in "$outdir/musescore2_$debversion.orig.tar.xz".
-Check this in with pristine-tar after committing it to the upstream branch:
- \$ pristine-tar commit '$outdir/musescore2_$debversion.orig.tar.xz' upstream
-Then tag the upstream branch and merge it into master.
+Check this in with pristine-tar after committing it to the upstream-rochade branch:
+ \$ pristine-tar commit '$outdir/musescore2_$debversion.orig.tar.xz' upstream-rochade
+Then tag the upstream branch and merge it into rochade.
 EOF

diff --git a/debian/watch b/debian/watch
index d2e7550..29ab550 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -4,7 +4,7 @@ version=4
 opts=\
 uversionmangle=s/%25/~/,\
 dversionmangle=s/\+dfsg\d*$//,\
-repacksuffix=+dfsg3,\
+repacksuffix=+dfsg4,\
 compression=gz,\
 filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/MuseScore-$1\.tar\.gz/ \
   https://github.com/musescore/MuseScore/tags .*/v?(2.[0-9](?:[0-9.]*(?:%25pre)?[0-9]+)?)\.tar\.gz \