[SCM] calf/master: Update copyright info: Extend coverage for main upstream authors. Join same-license Files sections. Fix add License section ISC."

Mon Feb 22 09:44:14 UTC 2016

The following commit has been merged in the master branch:
commit 7cff861433f665dc4041db6fc6476ba0475e04ec
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Sep 14 16:26:16 2014 +0200

    Update copyright info: Extend coverage for main upstream authors. Join same-license Files sections. Fix add License section ISC."

diff --git a/debian/copyright b/debian/copyright
index a942507..ebbd257 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,28 +5,37 @@ Source: http://calf.sourceforge.net/
  git://repo.or.cz/calf.git
 
 Files: *
-Copyright: 2001-2009, Krzysztof Foltman <wdev at foltman.com>
+Copyright: 2001-2014, Krzysztof Foltman <wdev at foltman.com>
+  2001-2014, Markus Schmidt
+  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
 
 Files: */Makefile.in
 Copyright: 1994-2009, Free Software Foundation, Inc.
 License: GAP~Makefile.in
 
-Files: src/calf/lv2_string_port.h
-Copyright: 2008, Krzysztof Foltman <wdev at foltman.com>
-License: LGPL-2+~Lesser~header
-
 Files: src/calf/lv2_data_access.h
- src/calf/lv2_polymorphic_port.h
+ src/calf/lv2_event.h
  src/calf/lv2_uri_map.h
-Copyright: 2008, Dave Robillard <dave at drobilla.net>
+Copyright: 2006-2007, Lars Luthman <lars.luthman at gmail.com>
+  2008, Dave Robillard <dave at drobilla.net>
 License: LGPL-2+~Lesser~header
 
-Files: src/calf/jackhost.h
+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
-Copyright: 2007, Krzystof Foltman <wdev at foltman.com>
+ src/session_mgr.cpp
+Copyright: 2007-2011, Krzystof Foltman <wdev at foltman.com>
 License: GPL-2+
 
 Files: config.guess
@@ -48,10 +57,6 @@ Files: aclocal.m4
 Copyright: 1996-2009, Free Software Foundation, Inc.
 License: GAP
 
-Files: src/calf/lv2_contexts.h
-Copyright: 2007-2008, Dave Robillard <dave at drobilla.net>
-License: GPL-2+~header
-
 Files: ltmain.sh
 Copyright: 1996-2001,2003-2008, Free Software Foundation, Inc
 License: GPL-2+ with Libtool exception
@@ -60,32 +65,13 @@ License: GPL-2+ with Libtool exception
  using GNU Libtool, you may include this file under the same
  distribution terms that you use for the rest of that program.
 
-Files: src/calf/lv2_event.h
-Copyright: 2006-2007, Lars Luthman <lars.luthman at gmail.com>
-  2008, Dave Robillard <dave at drobilla.net>
-License: LGPL-2+~Lesser~header
-
-Files: src/calf/metadata.h
-Copyright: 2007-2008, Krzysztof Foltman <wdev at foltman.com>
-  2008, Thor Harald Johansen <thj at thj.no>
-License: LGPL-2+~Lesser
-
-Files: src/calf/lv2-midiport.h
-Copyright: 2006, Lars Luthman <lars.luthman at gmail.com>
-License: LGPL-2+~Lesser
-
-Files: src/calf/modules_dev.h
-Copyright: 2008, Thor Harald Johansen <thj at thj.no>
-License: LGPL-2+~Lesser
-
 Files: src/calf/lv2_ui.h
-Copyright: 2000-2002, Paul Barton-Davis
-  2000-2002, Richard W.E. Furse
-  2000-2002, Stefan Westerfeld
-  2006, Dave Robillard <dave at grobilla.net>
-  2006, Steve Harris
-  2006-2008 Lars Luthman <lars.luthman at gmail.com>
-License: LGPL-2.1+~header
+ src/calf/lv2_options.h
+ src/calf/lv2_state.h
+Copyright: 2006-2011, Lars Luthman <lars.luthman at gmail.com>
+  2009-2014, David Robillard <d at drobilla.net>
+  2010, Leonard Ritter <paniq at paniq.org>
+License: ISC
 
 Files: install-sh
 Copyright: 1994, X Consortium
@@ -143,26 +129,6 @@ License: LGPL-2+~Lesser~header
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
-License: LGPL-2.1+~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.1 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.
- .
- Comment:
- .
- On Debian systems the 'GNU Lesser General Public License' version 2.1
- is located in '/usr/share/common-licenses/LGPL-2.1'.
- .
- You should have received a copy of the 'GNU Lesser General Public
- License' along with this program.  If not, see
- <http://www.gnu.org/licenses/>.
-
 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
@@ -182,17 +148,6 @@ License: 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: GPL-2+~header
- This header 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 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
- General Public License for more details.
-
 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
@@ -252,3 +207,17 @@ License: Expat~X
  OTHER 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: ISC
+ Permission to use, copy, modify, and/or distribute this software for
+ any purpose with or without fee is hereby granted, provided that the
+ above copyright notice and this permission notice appear in all copies.
+ .
+ THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
+ BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
+ OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.

-- 
calf audio plugins packaging

