Fix some minor errors and omissions in debian/copyright

Also add Dr. Tobias Quathamer and me as contributors to debian/*,
and update some copyright years to match those listed in the current
LilyPond 2.19.53 source.

diff --git a/debian/copyright b/debian/copyright
index 93593f54a527b3122fc4a8334121fc484c881f3d..3c36d6348aa1fe87193db6955adf04bf805121f7 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,13 +4,15 @@ Upstream-Contact: lilypond-devel@gnu.org
 Source: http://www.lilypond.org/
 
 Files: *
 Source: http://www.lilypond.org/
 
 Files: *

-Copyright: 1993--2012, Han-Wen Nienhuys <hanwen@lilypond.org>,
-          1996--2012, Jan Nieuwenhuizen <janneke@gnu.org>,
+Copyright: 1993--2015, Han-Wen Nienhuys <hanwen@lilypond.org>
+           1996--2015, Jan Nieuwenhuizen <janneke@gnu.org>

 License: GPL-3+
 
 Files: debian/*
 License: GPL-3+
 
 Files: debian/*

-Copyright: 2010-2012 Don Armstrong <don@debian.org>,
-          2005-2010 Anthony Fok <foka@debian.org>
+Copyright: 2009-2014 Don Armstrong <don@debian.org>
+           2005-2008 Thomas Bushnell, BSG <tb@debian.org>
+           2016      Dr. Tobias Quathamer <toddy@debian.org>
+           1997-2004, 2017 Anthony Fok <foka@debian.org>

 License: GPL-2+
 
 Files: Documentation/*
 License: GPL-2+
 
 Files: Documentation/*


@@ -25,6 +27,11 @@ Files: input/regression/musicxml/*
 Copyright: 2008-2010, Reinhold Kainhofer
 License: MIT
 
 Copyright: 2008-2010, Reinhold Kainhofer
 License: MIT
 

+Files: mf/*
+Copyright: 1996--2015, The LilyPond authors (lilypond.org)
+License: OFL-1.1
+Comment: with Reserved Font Name "Emmentaler" and "Feta".
+

 
 Files: flower/include/matrix.hh
  lily/constrained-breaking.cc
 
 Files: flower/include/matrix.hh
  lily/constrained-breaking.cc


@@ -312,7 +319,7 @@ License: GFDL-1.3+
  On Debian systems, the complete text of version 1.3 of the GNU Free
  Documenation License can be found in
  `/usr/share/common-licenses/GFDL-1.3'.
  On Debian systems, the complete text of version 1.3 of the GNU Free
  Documenation License can be found in
  `/usr/share/common-licenses/GFDL-1.3'.

- 
+

 
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
 
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify


@@ -320,6 +327,14 @@ License: GPL-3+
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
  .
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
  .

+ This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ .

  On Debian systems, the complete text of version 3 of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-3'.
 
  On Debian systems, the complete text of version 3 of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-3'.
 


@@ -329,8 +344,18 @@ License: GPL-2+
  the Free Software Foundation, either version 2 of the License, or
  (at your option) any later version.
  .
  the Free Software Foundation, either version 2 of the License, or
  (at your option) any later version.
  .

- On Debian systems, the complete text of version 3 of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-3'.
+ This program 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 program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+

 
 License: LPPL-1.3c+
   The LaTeX Project Public License
 
 License: LPPL-1.3c+
   The LaTeX Project Public License


@@ -761,3 +786,96 @@ License: MIT
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.

+
+License: OFL-1.1
+ This Font Software is licensed under the SIL Open Font License, Version 1.1.
+ .
+ This license is copied below, and is also available with a FAQ at:
+ http://scripts.sil.org/OFL
+ .
+ SIL OPEN FONT LICENSE
+ .
+ Version 1.1 - 26 February 2007
+ .
+ PREAMBLE
+ The goals of the Open Font License (OFL) are to stimulate worldwide
+ development of collaborative font projects, to support the font creation
+ efforts of academic and linguistic communities, and to provide a free and
+ open framework in which fonts may be shared and improved in partnership
+ with others.
+ .
+ The OFL allows the licensed fonts to be used, studied, modified and
+ redistributed freely as long as they are not sold by themselves. The
+ fonts, including any derivative works, can be bundled, embedded,
+ redistributed and/or sold with any software provided that any reserved
+ names are not used by derivative works. The fonts and derivatives,
+ however, cannot be released under any other type of license. The
+ requirement for fonts to remain under this license does not apply
+ to any document created using the fonts or their derivatives.
+ .
+ DEFINITIONS
+ "Font Software" refers to the set of files released by the Copyright
+ Holder(s) under this license and clearly marked as such. This may
+ include source files, build scripts and documentation.
+ .
+ "Reserved Font Name" refers to any names specified as such after the
+ copyright statement(s).
+ .
+ "Original Version" refers to the collection of Font Software components as
+ distributed by the Copyright Holder(s).
+ .
+ "Modified Version" refers to any derivative made by adding to, deleting,
+ or substituting -- in part or in whole -- any of the components of the
+ Original Version, by changing formats or by porting the Font Software to a
+ new environment.
+ .
+ "Author" refers to any designer, engineer, programmer, technical
+ writer or other person who contributed to the Font Software.
+ .
+ PERMISSION & CONDITIONS
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of the Font Software, to use, study, copy, merge, embed, modify,
+ redistribute, and sell modified and unmodified copies of the Font
+ Software, subject to the following conditions:
+ .
+ 1) Neither the Font Software nor any of its individual components,
+ in Original or Modified Versions, may be sold by itself.
+ .
+ 2) Original or Modified Versions of the Font Software may be bundled,
+ redistributed and/or sold with any software, provided that each copy
+ contains the above copyright notice and this license. These can be
+ included either as stand-alone text files, human-readable headers or
+ in the appropriate machine-readable metadata fields within text or
+ binary files as long as those fields can be easily viewed by the user.
+ .
+ 3) No Modified Version of the Font Software may use the Reserved Font
+ Name(s) unless explicit written permission is granted by the corresponding
+ Copyright Holder. This restriction only applies to the primary font name as
+ presented to the users.
+ .
+ 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+ Software shall not be used to promote, endorse or advertise any
+ Modified Version, except to acknowledge the contribution(s) of the
+ Copyright Holder(s) and the Author(s) or with their explicit written
+ permission.
+ .
+ 5) The Font Software, modified or unmodified, in part or in whole,
+ must be distributed entirely under this license, and must not be
+ distributed under any other license. The requirement for fonts to
+ remain under this license does not apply to any document created
+ using the Font Software.
+ .
+ TERMINATION
+ This license becomes null and void if any of the above conditions are
+ not met.
+ .
+ DISCLAIMER
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+ OTHER DEALINGS IN THE FONT SOFTWARE.