[SCM] audiofile/master: Update debian/copyright.

Thu Jan 5 11:19:01 UTC 2012

The following commit has been merged in the master branch:
commit 203915798e3d36a9636173f6237db04822465241
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jan 5 12:18:54 2012 +0100

    Update debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 290549c..782d9b3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,69 +1,196 @@
-This package was debianized by Daniel Kobras <kobras at debian.org> on
-Tue, 13 Mar 2001 19:27:39 +0100
-
-It was downloaded from http://www.68k.org/~michael/audiofile/
-
-Upstream Author: Michael Pruett <michael at 68k.org>
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=204
+Upstream-Name: audiofile
+Upstream-Contact: Michael Pruett <michael at 68k.org>
+Source: http://www.68k.org/~michael/audiofile/
+Copyright: 1998-2011 Michael Pruett <michael at 68k.org>
 
+Files: *
 Copyright:
-		1998-2000, 2003-2004, 2010 Michael Pruett <michael at 68k.org>
-		2000-2001, Silicon Graphics, Inc.
-		except for ADPCM code, which is Copyright 1992 by
-		Stichting Mathematisch Centrum, Amsterdam, The Netherlands.
-
-* The Audio File Library itself is available under the GNU Library General
-  Public License
-
-	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.
-
-* The programs in this package are available under the GNU General Public
-  License.
-
-	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 of
-	the License, 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.
-
-* The ADPCM code comes with the following permissions:
-
-	/***********************************************************
-	Copyright 1992 by Stichting Mathematisch Centrum, Amsterdam, The
-	Netherlands.
-
-				All Rights Reserved
+ 1998-2011 Michael Pruett <michael at 68k.org>
+ 2000-2001, Silicon Graphics, Inc
+ 1999, Elliot Lee <sopwith at redhat.com>
+License: LGPL-2+
+
+Files:
+ ltmain.sh
+ test/writeulaw.c
+ test/testchannelmatrix.c
+ test/writeraw.c
+ test/testfloat.c
+ test/twentyfour2.c
+ test/pipe.c
+ test/instparamtest.c
+ test/floatto24.c
+ test/query2.c
+ test/twentyfour.c
+ test/sixteen-to-eight.c
+ test/testaupv.c
+ test/testmarkers.c
+ test/instparamwrite.c
+ test/transparency.c
+ test/testdouble.c
+ test/printmarkers.c
+ test/writealaw.c
+ test/writeulaw.c
+ examples/*
+ sfcommands/*
+Copyright:
+ 1998-2011 Michael Pruett <michael at 68k.org>
+ 2001-2003, Silicon Graphics, Inc
+ 1996-2008 Free Software Foundation, Inc
+License: GPL-2+
+
+Files:
+ libaudiofile/ScopedArray.h
+ libaudiofile/File.*
+ libaudiofile/Shared.h
+ libaudiofile/UUID.h
+ libaudiofile/UUID.cpp
+ examples/alsaplay.cpp
+ examples/osxplay.c
+ test/*
+Copyright:
+ 2010, Michael Pruett
+License: BSD-3-clause
 
-	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 names of Stichting Mathematisch
-	Centrum or CWI not be used in advertising or publicity pertaining to
-	distribution of the software without specific, written prior permission.
+Files: libaudiofile/modules/adpcm.c
+Copyright:
+ 1992 by Stichting Mathematisch Centrum, Amsterdam, The Netherlands
+License: other-1
 
-	STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
-	THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-	FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM 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: libaudiofile/g711.h
+Copyright: no copyright holders
+License: other-2
 
-	******************************************************************/
+Files: test/gtest/*
+Copyright: 2005-2008, Google Inc.
+License: other-3
 
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2', the
-complete text of the GNU Library General Public License is available at
-'/usr/share/common-licenses/LGPL-2'.
+Files: debian/*
+Copyright:
+ 2011-2012 Alessio Treglia <alessio at debian.org>
+ 2001-2009 Daniel Kobras <kobras at debian.org>
+License: GPL-2+
+
+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 complete text of the GNU Library General
+ Public License can be found 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: 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 of
+ the License, 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 complete text of the GNU General
+ Public License can be found 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: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: other-1
+ 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 names of Stichting Mathematisch
+ Centrum or CWI not be used in advertising or publicity pertaining to
+ distribution of the software without specific, written prior permission.
+ .
+ STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM 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.
+
+License: other-2
+ This source code is a product of Sun Microsystems, Inc. and is provided
+ for unrestricted use.  Users may copy or modify this source code without
+ charge.
+ .
+ SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
+ THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ .
+ Sun source code is provided with no support and without any obligation on
+ the part of Sun Microsystems, Inc. to assist in its use, correction,
+ modification or enhancement.
+ .
+ SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
+ OR ANY PART THEREOF.
+ .
+ In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ or profits or other special, indirect and consequential damages, even if
+ Sun has been advised of the possibility of such damages.
+
+License: other-3
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+     * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+     * Neither the name of Google Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-- 
audiofile packaging

