[SCM] libshout-idjc/master: Fix errors in copyright file

[ross-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c7f76bc9c35e6a4920cad69a93cfee2468aec35d
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Sun May 15 16:55:52 2016 +0200

    Fix errors in copyright file

diff --git a/debian/copyright b/debian/copyright
index b826b61..8225b7c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,6 +18,8 @@ Files: compile
  depcomp
  ltmain.sh
  missing
+ config.guess
+ config.sub
 Copyright: 1999-2015, Free Software Foundation, Inc.
 License: GPL-2+ with Autoconf exception
  As a special exception to the GNU General Public License, if you
@@ -25,15 +27,6 @@ License: GPL-2+ with Autoconf exception
  script generated by Autoconf, you may include it under the same
  distribution terms that you use for the rest of that program.
 
-Files: config.guess
- config.sub
-Copyright: 1992-2015, Free Software Foundation, Inc.
-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
- script generated by Autoconf, you may include it under the same
- distribution terms that you use for the rest of that program.
-
 Files: configure
 Copyright: 1992-1996,1998-2010, Free Software Foundation, Inc.
 License: GAP~configure
@@ -54,10 +47,6 @@ Copyright: 2014 Michael Smith <msmith at icecast.org>
   2014 Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
 License: GPL-2+
 
-Files: src/net/sock.h
-Copyright: 1999, the icecast team
-License: GPL-2+
-
 Files: src/common/net/resolver.c
  src/common/net/sock.*
 Copyright: 2014 Michael Smith <msmith at icecast.org>
@@ -104,8 +93,7 @@ Copyright: 2014 Michael Smith <msmith at icecast.org>
   2014 Ralph Giles <giles at xiph.org>
 License: GPL-2+
 
-Files: src/opus.c
- src/codec_opus.c
+Files: src/codec_opus.c
 Copyright: 2005, the Icecast team <team at icecast.org>
   2011-2012, Xiph.Org Foundation
 License: LGPL-2+
@@ -148,16 +136,6 @@ Comment:
  License' along with this library.  If not, see
  <http://www.gnu.org/licenses/>.
 
-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: 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
@@ -169,17 +147,6 @@ License: GPL-2+
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  General Public License for more details.
 
-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: Expat~X
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the

-- 
libshout-idjc packaging