[SCM] musescore/master: fixup soundfont licence info:

tg at users.alioth.debian.org tg at users.alioth.debian.org
Tue Oct 10 19:06:59 UTC 2017


The following commit has been merged in the master branch:
commit 4e13bdfd1a99e923ee9f497a6196f9a74ec7fde6
Author: mirabilos <tg at debian.org>
Date:   Tue Oct 10 17:57:31 2017 +0200

    fixup soundfont licence info:
    
    - correct info in debian/copyright from soundfont’s extra licence file
    - do not ship the latter, that’s not allowed in Debian

diff --git a/debian/changelog b/debian/changelog
index 125d47d..e65c6f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ musescore (2.1.0+dfsg1-1) unstable; urgency=low
 
   * Add myself to Uploaders (10x tvaz)
   * Update Homepage while here
+  * Fix soundfont copyright information, do not ship extra licence file
 
- -- Thorsten Glaser <tg at mirbsd.de>  Tue, 10 Oct 2017 17:43:14 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 10 Oct 2017 17:57:10 +0200
 
 musescore (2.1.0+dfsg1-0.2) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 36075ec..7765936 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -210,7 +210,15 @@ License: GPL-2
 
 Files: share/sound/FluidR3*
 Copyright: 2000-2002, 2008, Frank Wen <getfrank at gmail.com>
-                 2014-2015, Michael Cowgill
+		      2002, Ethan Winer
+		      2016, Michael Schorsch
+                 2014-2016, Michael Cowgill
+Comment: Fluid was constructed in part from samples found in the public
+ domain that I [Frank Wen] edited/cleaned/remixed/programmed and largely
+ from recordings of my own and in conjunction with the people below who
+ helped along the way: Suren M. Seron, Scott Hanan, Steve Aupperle,
+ Chris Gillman, Alex Taubr, Chris Prola, Andrew Klenk, Winfried Hubbe,
+ Dylan, Tim, Gort, Uros Katic, Ethan Winer (http://www.ethanwiner.com)
 License: Expat
 
 Files: share/wallpaper/paper4.png
diff --git a/debian/rules b/debian/rules
index 8198517..2a7588f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,9 @@ override_dh_auto_build:
 	dh_auto_build -- lrelease all
 
 override_dh_install-indep:
+	# included in debian/copyright
+	rm -f debian/tmp/usr/share/mscore-*/sound/FluidR3Mono_License.md
+	# move stuff to packages
 	dh_install
 	cd $(CURDIR)/debian/musescore-common/usr/share && ln -s mscore-* mscore
 

-- 
musescore packaging



More information about the pkg-multimedia-commits mailing list