[SCM] libshout/master: Update copyright info: Extend and merge most upstream Files sections, now relicensed to L-2+. Extend and refine coverage of autotools.

Tue Aug 29 12:28:50 UTC 2017

The following commit has been merged in the master branch:
commit 19eba1100f9e2c693f3c1d45ea0251d0a766d3f5
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Aug 29 14:08:29 2017 +0200

    Update copyright info: Extend and merge most upstream Files sections, now relicensed to L-2+. Extend and refine coverage of autotools.

diff --git a/debian/copyright b/debian/copyright
index b8fb4d8..89fb5e7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,16 @@ Source: http://downloads.xiph.org/releases/libshout/
  https://git.xiph.org/icecast-libshout.git
 
 Files: *
-Copyright: 1999-2000,2002-2012, the Icecast team <team at icecast.org>
+Copyright:
+  2002-2012, the Icecast team <team at icecast.org>
+  2012-2015, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
+  2014, Brendan Cully <brendan at xiph.org>
+  2014, Ed "oddsock" Zaleski <oddsock at xiph.org>
+  2014, Jack Moffitt <jack at icecast.org>
+  2014, Karl Heyes <karl at xiph.org>
+  2014, Michael Smith <msmith at icecast.org>
+  2014, Moritz Grimm <mdgrimm at gmx.net>
+  2014, Ralph Giles <giles at xiph.org>
 License-Grant:
  This library is free software; you can redistribute it and/or modify it
  under the terms of the GNU Library General Public License as published
@@ -14,14 +23,32 @@ License-Grant:
 License: LGPL-2+
 
 Files: */Makefile.in
-Copyright: 1994-2009, Free Software Foundation, Inc.
+Copyright: 1994-2014, Free Software Foundation, Inc.
 License: FSFULLR~Makefile.in
 
+Files: ltmain.sh
+ m4/libtool.m4
+Copyright: 1996-2001,2003-2011, Free Software Foundation, Inc.
+License-Grant:
+ GNU Libtool 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: FSFULLR and 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 using GNU Libtool, you may include this file under the
+ same distribution terms that you use for the rest of that program.
+
 Files: compile
  depcomp
- ltmain.sh
  missing
-Copyright: 1996-2009, Free Software Foundation, Inc.
+Copyright: 1999-2014, 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
@@ -30,60 +57,33 @@ License: GPL-2+ with Autoconf exception
 
 Files: config.guess
  config.sub
-Copyright: 1992-2009, Free Software Foundation, Inc.
+Copyright: 1992-2014, Free Software Foundation, Inc.
 License-Grant:
  This file 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+~file with Autoconf exception
+ Free Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
+License: GPL-3+~file 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
  script generated by Autoconf, you may include it under the same
- distribution terms that you use for the rest of that program.
+ distribution terms that you use for the rest of that program. This
+ Exception is an additional permission under section 7 of the GNU
+ General Public License, version 3 ("GPLv3").
 
-Files: src/avl/*
+Files: src/common/avl/*
 Copyright: 1995-1997, Sam Rushing <rushing at nightmare.com>
 License: NTP~Rushing
 
 Files: configure
-Copyright: 1992-1996,1998-2010, Free Software Foundation, Inc.
+Copyright: 1992-1996,1998-2012, Free Software Foundation, Inc.
 License: FSFUL
 
 Files: aclocal.m4
+ m4/lt*.m4
 Copyright: 1996-2009, Free Software Foundation, Inc
 License: FSFULLR
 
-Files: src/net/sock.h
-Copyright: 1999, the icecast team
-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/opus.c
-Copyright: 2005, the Icecast team <team at icecast.org>
-  2011-2012, Xiph.Org Foundation
-License-Grant:
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library 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+
-
-Files:
- src/httpp/*
- src/timing/*
-Copyright: jack moffitt <jack at icecast.org>
-License.Grant:
- This program is distributed under the GNU General Public License,
- version 2.  A copy of this license is included with this source.
-License: GPL-2
-Comment:
- Source lacks copyright. Assumed from README file in same directory.
-
 Files: install-sh
 Copyright: 1994, X Consortium
 License: X11
@@ -101,18 +101,15 @@ License: GPL-3+
 License: LGPL-2+
 License-Reference: /usr/share/common-licenses/LGPL-2
 
-License: GPL-2
-License-Reference: /usr/share/common-licenses/GPL-2
-
 License: GPL-2+
 License-Reference: /usr/share/common-licenses/GPL-2
 
-License: GPL-2+~file
-License-Reference: /usr/share/common-licenses/GPL-2
-
 License: GPL-3+
 License-Reference: /usr/share/common-licenses/GPL-3
 
+License: GPL-3+~file
+License-Reference: /usr/share/common-licenses/GPL-3
+
 License: X11
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the

-- 
libshout packaging

