[SCM] csound-manual/master: Update copright format

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9ff543779a109204f12568dfba66d49e42992478
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Nov 16 21:28:28 2015 -0300

    Update copright format

diff --git a/debian/copyright b/debian/copyright
index 8e34513..e47559d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
-Name: the Public Csound Reference Manual
-Maintainer: Andrés Cabrera
-	csound-devel at lists.sourceforge.net
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: the Public Csound Reference Manual
+Upstream-Contact: Andrés Cabrera
+                  csound-devel at lists.sourceforge.net
 Source: http://csound.sourceforge.net/
 Disclaimer:
   The csound manual has a long and complicated history. You can read it in the
@@ -12,13 +12,11 @@ Disclaimer:
   a CVS repository in Sourceforge. Since then, all contributions have been made
   through the csound mailing list and cvs repository there. Many contributors
   will not be listed here, but all contributions have been made under the GFDL.
+Files-Excluded:
+ ./examples/22Bassoon.sf2 ./examples/01hpschd.sf2
+ ./opcodes/py*.xml
 
-Excluded: ./examples/22Bassoon.sf2 ./examples/01hpschd.sf2
-Reason: Possibly non free soundfonts
-
-Excluded: ./opcodes/py*.xml
-Reason: Licensing status is not clear upstream
-
+Files: *
 Copyright: 1986-2010, Andrés Cabrera
    Allan Lee
    Anthony Kozar
@@ -67,15 +65,15 @@ Copyright: 1986-2010, Andrés Cabrera
    Ville Pulkki
 License: GFDL-1.2+
 
-Files: ./csd2docbook.py,
-	./csd2docbook2.py
+Files: ./csd2docbook.py
+ ./csd2docbook2.py
 Copyright: 2007, Francois Pinot
 License: LGPL-2.1+
 
-Files: ./csound.css,
-	./csoundXO.css
+Files: ./csound.css
+ ./csoundXO.css
 Copyright: 2007, Francois Pinot
-	2008, Andres Cabrera
+ 2008, Andres Cabrera
 License: other-vague-GFDL
 
 Files: ./csound-bw.css
@@ -86,8 +84,9 @@ Files: ./compare_opcode_lists.py
 Copyright: Andres Cabrera <mantaraya36 at gmail.com>
 License: other-vague-GPL
 
-Files: ./opcodeparser.py,
-	./quickref.py
+Files: ./opcodeparser.py
+ ./quickref.py
+Copyright: Andres Cabrera <manaraya36 at gmail.com>
 License: GPL-3+
 
 Files: ./makeframes.py
@@ -100,7 +99,7 @@ License: GPL-2+
 
 Files: ./debian/rules
 Copyright: 2007-2010, Felipe Sateler <fsateler at debian.org>
-	2008-2010, Jonas Smedegaard <dr at jones.dk>
+ 2008-2010, Jonas Smedegaard <dr at jones.dk>
 License: GPL-2+
 
 License: GFDL-1.2+
@@ -114,6 +113,24 @@ License: GFDL-1.2+
  License (GFDL) version 2.1 can be found in
  '/usr/share/common-licenses/GFDL-1.2'.
 
+License: GPL-2+
+ This program 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 2
+ of the License, or (at your option) any later version.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License (GPL) can be found in '/usr/share/common-licenses/GPL-2'.
+
+License: GPL-3+
+ This program 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.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License (GPL) can be found in '/usr/share/common-licenses/GPL-3'.
+
 License: LGPL-2.1+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public License

-- 
csound-manual packaging