[SCM] libshout/master: Update copyright file: Rewrite using draft DEP-5 format.

Mon Dec 19 07:46:16 UTC 2011

The following commit has been merged in the master branch:
commit dd3338121acbcb6a95ea5e4172ad5d9835d896a7
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Dec 19 00:24:54 2011 +0700

    Update copyright file: Rewrite using draft DEP-5 format.

diff --git a/debian/copyright b/debian/copyright
index 164a32c..e0fda82 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,79 +1,166 @@
-This is libshout packaged for Debian GNU systems.
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Upstream-Name: libshout
+Upstream-Contact: the Icecast team <team at icecast.org>
+Source: http://downloads.xiph.org/releases/libshout/
 
+Files: *
+Copyright: 1999-2000,2002-2005, the Icecast team <team at icecast.org>
+License: LGPL-2+
+
+Files: */Makefile.in
+Copyright: 1994-2005, Free Software Foundation, Inc.
+License: GAP~Makefile.in
 
-Upstream source: http://downloads.xiph.org/releases/libshout/
+Files: compile
+ depcomp
+ ltmain.sh
+ missing
+Copyright: 1996-2005, Free Software Foundation, Inc.
+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
+ script generated by Autoconf, you may include it under the same
+ distribution terms that you use for the rest of that program.
 
-Note: Tarball distributed with Debian is currently not pristine: the
-subdir "debian" has been stripped to not clash with the official Debian
-packaging files.
+Files: config.guess
+ config.sub
+Copyright: 1992-2005, 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: src/avl/*
+Copyright: 1995-1997, Sam Rushing <rushing at nightmare.com>
+License: NTP~Rushing
 
-Upstream Authors: the icecast team <team at icecast.org>
+Files: configure
+Copyright: 2003, Free Software Foundation, Inc.
+License: GAP~configure
 
+Files: aclocal.m4
+Copyright: 1996-2005, Free Software Foundation, Inc
+License: GAP
+
+Files: src/net/sock.h
+Copyright: 1999, the icecast team
+License: GPL-2+
+
+Files: install-sh
+Copyright: 1994, X Consortium
+License: Expat~X with X exception
+ Except as contained in this notice, the name of the X Consortium shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization
+ from the X Consortium.
+
+Files: debian/*
+Copyright: 2003, Keegan Quinn <ice at thebasement.org>
+ 2004-2008, 2011 Jonas Smedegaard <dr at jones.dk>
+License: GPL-2+
 
-Files: *
-Copyright: © 2002-2003 the Icecast team <team at icecast.org>
 Licence: LGPL-2+
- Copyright (C) 2002-2003 the Icecast team <team at icecast.org>
+ 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 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/>.
 
-Files: src/avl/*
-Copyright: © 1995-1997 Sam Rushing <rushing at nightmare.com>
-Licence: Other
- Copyright (C) 1995-1997 by Sam Rushing <rushing at nightmare.com>
- . 
- All Rights Reserved
- . 
- Permission to use, copy, modify, and distribute this software and
- its documentation for any purpose and without fee is hereby
- granted, provided that the above copyright notice appear in all
- copies and that both that copyright notice and this permission
- notice appear in supporting documentation, and that the name of Sam
- Rushing not be used in advertising or publicity pertaining to
- distribution of the software without specific, written prior
- permission.
- . 
- SAM RUSHING DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- NO EVENT SHALL SAM RUSHING BE LIABLE FOR ANY SPECIAL, 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.
-
-Files: src/thread/*
-Copyright: © 1999, 2000 the icecast team <team at icecast.org>
-Licence: LGPL-2+
- Copyright (c) 1999, 2000 the icecast team <team at icecast.org>
+Licence: 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'.
  .
- 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.
+ You should have received a copy of the 'GNU General Public License'
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-Files: src/net/*
-Copyright: © 1999 the icecast team <team at icecast.org>
-Licence: LGPL-2+
- Copyright (C) 1999 the icecast team <team at icecast.org>
+Licence: 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.
+
+Licence: 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
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
  .
- 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.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ 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: NTP~Rushing
+ Copyright (C) 1995-1997 by Sam Rushing <rushing at nightmare.com>
+ .
+ All Rights Reserved
+ .
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of Sam Rushing not be used
+ in advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.
+ .
+ SAM RUSHING DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL SAM RUSHING BE LIABLE FOR ANY SPECIAL, 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.
 
-Files: src/httpp/*
-Copyright: © jack moffitt <jack at icecast.org>
-Licence: LGPL-any
-  lgpl
-  .
-  by jack moffitt <jack at icecast.org>
+License: GAP
+ This file is free software; the Free Software Foundation
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.
 
+License: GAP~configure
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
 
-On Debian systems, the complete text of both the GNU Library General Public
-License (LGPL) and the GNU Library General Public License version 2 
-(LGPL-2) can be found below `/usr/share/common-licenses/'.
+License: GAP~Makefile.in
+ This Makefile.in is free software; the Free Software Foundation
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.

-- 
libshout packaging

