[SCM] libshout/master: Update copyright info: Use License-Grant and License-Reference fields. Thanks to Ben Finney. Fix add Files section licensed as GPL-2.

Tue Aug 29 11:14:26 UTC 2017

The following commit has been merged in the master branch:
commit 4d7e8058c3501ac346b13b2cd4f178e512c3f291
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Aug 29 10:47:27 2017 +0200

    Update copyright info: Use License-Grant and License-Reference fields. Thanks to Ben Finney. Fix add Files section licensed as GPL-2.

diff --git a/debian/copyright b/debian/copyright
index 997b12f..b8fb4d8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,11 @@ Source: http://downloads.xiph.org/releases/libshout/
 
 Files: *
 Copyright: 1999-2000,2002-2012, the Icecast team <team at icecast.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
+ by the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
 License: LGPL-2+
 
 Files: */Makefile.in
@@ -26,6 +31,11 @@ License: GPL-2+ with Autoconf exception
 Files: config.guess
  config.sub
 Copyright: 1992-2009, 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
  As a special exception to the GNU General Public License, if you
  distribute this file as part of a program that contains a configuration
@@ -46,13 +56,34 @@ 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
@@ -60,71 +91,27 @@ License: X11
 Files: debian/*
 Copyright: 2003, Keegan Quinn <ice at thebasement.org>
   2004-2008,2011-2013,2016-2017, Jonas Smedegaard <dr at jones.dk>
+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, or (at your option) any
+ later version.
 License: GPL-3+
 
 License: LGPL-2+
- 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.
- .
- This library 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
- Library General Public License for more details.
-Comment:
- 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 library.  If not, see
- <http://www.gnu.org/licenses/>.
+License-Reference: /usr/share/common-licenses/LGPL-2
 
 License: GPL-2
- This program is distributed under the GNU General Public License,
- version 2.  A copy of this license is included with this source.
-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-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.
-
-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-2
 
 License: GPL-2+~file
- 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.
- .
- 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.
+License-Reference: /usr/share/common-licenses/GPL-2
+
+License: GPL-3+
+License-Reference: /usr/share/common-licenses/GPL-3
 
 License: X11
  Permission is hereby granted, free of charge, to any person obtaining a

-- 
libshout packaging

