[SCM] icecast2/master: Rewrite copyright file, using DEP5 format.

Wed Jun 13 00:24:43 UTC 2012

The following commit has been merged in the master branch:
commit 08c787bd14a5d7733db100f531a9c9cc0d6705e1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jun 13 02:19:05 2012 +0200

    Rewrite copyright file, using DEP5 format.

diff --git a/debian/copyright b/debian/copyright
index 17971af..4b45586 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,72 +1,116 @@
-This is Icecast 2.x packaged for Debian.
-
-Upstream source: http://downloads.us.xiph.org/releases/icecast/
-
-Note: Tarball distributed with Debian is currently not pristine: the
-subdir "debian" has been stripped to not clash with the official Debian
-packaging files.
-
-Upstream Authors: the icecast team <team at icecast.org>
-
-Copyright and license; src/avl/:
-
- * 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.
-
-Copyright and license; src/thread/:
-
- * Copyright (c) 1999, 2000 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.
-
-Copyright and license; src/net/:
-
- * Copyright (C) 1999 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.
-
-Copyright and license; src/httpp/ and src/timing:
-
-  lgpl
-  
-  by jack moffitt <jack at icecast.org>
-
-Copyright and license; other files (found in src/client.c):
-
- * This program is distributed under the GNU General Public License, version 2.
- * A copy of this license is included with this source.
- *
- * Copyright 2000-2004, Jack Moffitt <jack at xiph.org, 
- *                      Michael Smith <msmith at xiph.org>,
- *                      oddsock <oddsock at xiph.org>,
- *                      Karl Heyes <karl at xiph.org>
- *                      and others (see AUTHORS for details).
-
-
-On Debian systems, the complete text of both the GNU General Public
-License (GPL) and the GNU Library General Public License (LGPL) can be
-found below `/usr/share/common-licenses/'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Icecast
+Upstream-Contact: the icecast team <team at icecast.org>
+Source: http://downloads.us.xiph.org/releases/icecast/
+
+Files: *
+Copyright: 2000-2004, Jack Moffitt <jack at xiph.org>
+  2000-2004, Karl Heyes <karl at xiph.org>
+  2000-2004, Michael Smith <msmith at xiph.org>
+  2000-2004, oddsock <oddsock at xiph.org>
+  2011, Dave 'justdave' Miller <justdave at mozilla.com>
+  2011, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
+License: GPL-2
+
+Files: src/net/*
+ src/thread/*
+Copyright: 1999-2000, the icecast team <team at icecast.org>
+License: LGPL-2+
+
+Files: src/avl/*
+Copyright: 1995-1997, Sam Rushing <rushing at nightmare.com>
+License: MIT~Rushing
+
+Files: admin/vclt.xsl
+ admin/xspf.xsl
+  2007, Thomas B. Ruecker <tbr at ruecker-itk.de>
+  2011, Philipp Schafft <lion at lion.leolix.org>
+License: GPL-2+
+
+Files: src/net/sock.h
+Copyright: 1999, the icecast team
+License: GPL-2+
+
+Files: debian/po/fr.po
+Copyright: 2011, Debian French l10n team <debian-l10n-french at lists.debian.org>
+License: GPL-2+
+
+Files: debian/po/de.po
+Copyright: 2011, Erik Pfannenstein
+License: GPL-2+
+
+Files: debian/po/sv.po
+Copyright: 2011, Martin Bagge <brother at bsnet.se>
+License: GPL-2+
+
+Files: debian/po/cs.po
+Copyright: 2010, Michal Simunek <michal.simunek at gmail.com>
+License: GPL-2+
+
+Files: debian/po/es.po
+Copyright: 2011, Software in the Public Interest
+License: GPL-2+
+
+Files: debian/po/da.po
+Copyright: 2011, icecast2 & nedenstående oversættere
+License: GPL-2+
+
+Files: debian/rules
+Copyright: 2003-2009, 2012 Jonas Smedegaard <dr at jones.dk>
+License: GPL-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: 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: 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 program.  If not, see
+ <http://www.gnu.org/licenses/>.
+
+License: MIT~Rushing
+ 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.

-- 
icecast2 packaging

