[SCM] calf/master: Update copyright info: Use License-Grant and License-Reference fields. Thanks to Ben Finney.

Mon Feb 22 09:44:15 UTC 2016

The following commit has been merged in the master branch:
commit 0a25b6e95779215e5d03fea927dd714a87a11b12
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Feb 21 14:50:08 2016 +0100

    Update copyright info: Use License-Grant and License-Reference fields. Thanks to Ben Finney.

diff --git a/debian/copyright b/debian/copyright
index 9094436..3bfb0cf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,15 @@ Copyright: 2001-2014, Krzysztof Foltman <wdev at foltman.com>
   2001-2013, Thor Harald Johansen <thj at thj.no>
   2006, Lars Luthman <lars.luthman at gmail.com>
   2007-2010, Torben Hohn
-License: LGPL-2+~Lesser
+License-Grant:
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+License: LGPL-2+
+Comment:
+ The 'GNU Lesser General Public License' has no version 2, so actual
+ licensing is assumed to be the 'GNU Library General Public License'.
 
 Files: */Makefile.in
 Copyright: 1994-2013, Free Software Foundation, Inc.
@@ -18,27 +26,53 @@ License: FSFUL~Makefile.in
 
 Files: src/calf/lv2_data_access.h
 Copyright: 2008, Dave Robillard <dave at drobilla.net>
-License: LGPL-2+~Lesser~header
+License-Grant:
+ This header is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+License: LGPL-2+
+Comment:
+ The 'GNU Lesser General Public License' has no version 2, so actual
+ licensing is assumed to be the 'GNU Library General Public License'.
 
 Files: src/calf/gtk_session_env.h
  src/calf/host_session.h
  src/calf/jackhost.h
- src/calf/preset_gui.h
  src/calf/session_mgr.h
  src/calf/vumeter.h
  src/gtk_session_env.cpp
  src/host_session.cpp
  src/jack_client.cpp
  src/jackhost.cpp
- src/preset_gui.cpp
  src/session_mgr.cpp
 Copyright: 2007-2011, Krzystof Foltman <wdev at foltman.com>
+License-Grant:
+ 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, or (at your option) any
+ later version.
+License: GPL-2+
+
+Files: src/calf/preset_gui.h
+ src/preset_gui.cpp
+Copyright: 2007-2011, Krzystof Foltman <wdev at foltman.com>
+License-Grant:
+ 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.
 License: GPL-2+
 
 Files:
  depcomp
  missing
 Copyright: 1996-2013, Free Software Foundation, Inc.
+License-Grant:
+ 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, or (at your option) any
+ later version.
 License: GPL-2+ with Autoconf exception
  As a special exception to the GNU General Public License, if you
  distribute this file as part of a program that contains a configuration
@@ -55,6 +89,11 @@ License: FSFUL~file
 
 Files: ltmain.sh
 Copyright: 1996-2001,2003-2011, Free Software Foundation, Inc
+License-Grant:
+ 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.
 License: GPL-2+ with Libtool exception
  As a special exception to the GNU General Public License, if you
  distribute this file as part of a program or library that is built
@@ -79,6 +118,11 @@ Files:
  config.guess
  config.sub
 Copyright: 1992-2013, Free Software Foundation, Inc.
+License-Grant:
+ 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.
 License: GPL-3+ with Autoconf exception
  As a special exception to the GNU General Public License, if you
  distribute this file as part of a program that contains a configuration
@@ -100,30 +144,22 @@ License: PD
 
 Files: doc/manuals/scripts/jquery.js
 Copyright: 2005, 2014 jQuery Foundation, Inc. and other contributors
-License: Expat
-Comment:
- License:
- .
+ License-Grant:
  Released under the MIT license.
  .
  http://jquery.org/license
- .
- Comment:
- .
+License: Expat
+Comment:
  Referenced URL contains the Expat license.
 
 Files: doc/manuals/scripts/jquery.prettyPhoto.js
 Copyright: Stephane Caron <http://www.no-margin-for-errors.com>
-License: GPL-2
-Comment:
- License:
- .
+License-Grant:
  prettyPhoto is totally free to use, it is released the GPLv2
  (http://www.gnu.org/licenses/gpl-2.0.html) or Creative Commons 2.5
  license (http://creativecommons.org/licenses/by/2.5/).
- .
- Comment:
- ,
+License: GPL-2
+Comment:
  Included code lack license info.  Information was gathered from
  <https://www.no-margin-for-errors.com/projects/prettyphoto-jquery-lightbox-clone/>
  (only GPL license listed, as CC license bloats this document and is
@@ -132,76 +168,25 @@ Comment:
 Files: debian/*
 Copyright: 2009, Adrian Knoth <adi at drcomp.erfurt.thur.de>
   2010,2012-2014,2016, Jonas Smedegaard <dr at jones.dk>
-License: GPL-3+
-
-License: LGPL-2+~Lesser
+License-Grant:
  This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2 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
- Lesser General Public License for more details.
- .
- Comment:
- .
- The 'GNU Lesser General Public License' has no version 2, so actual
- licensing is assumed to be the 'GNU Library General Public License'.
- .
- On Debian systems the 'GNU Library General Public License' version 2 is
- located in '/usr/share/common-licenses/LGPL-2'.
- .
- You should have received a copy of the 'GNU Library General Public
- License' along with this program.  If not, see
- <http://www.gnu.org/licenses/>.
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 3, or (at your option) any
+ later version.
+License: GPL-3+
 
-License: LGPL-2+~Lesser~header
- This header is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This header 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
- Lesser General Public License for more details.
+License: LGPL-2+
+License-Reference: /usr/share/common-licenses/LGPL-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, 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.
- .
- Comment:
- .
- On Debian systems the 'GNU General Public License' version 2 is located
- in '/usr/share/common-licenses/GPL-2'.
- .
- You should have received a copy of the 'GNU General Public License'
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+License-Reference: /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, 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.
- .
- Comment:
- .
- On Debian systems the 'GNU General Public License' version 3 is located
- in '/usr/share/common-licenses/GPL-3'.
+License-Reference: /usr/share/common-licenses/GPL-3
 
 License: FSFUL
  This configure script is free software; the Free Software Foundation

-- 
calf audio plugins packaging

