[SCM] gmerlin-avdecoder/master: Update copyright (still BSD-4 flaws to workout, though).

Sat Nov 20 09:28:44 UTC 2010

The following commit has been merged in the master branch:
commit 2f2d0393dd618966728d2bd9b60dc3b291fb277e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Nov 20 07:08:20 2010 +0100

    Update copyright (still BSD-4 flaws to workout, though).

diff --git a/debian/copyright b/debian/copyright
index 0730485..8c0b57a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,71 +9,31 @@ Copyright: 1995-2001,2004-2006, Free Software Foundation, Inc.
 	2003-2009, Burkhard Plaum <plaum at ipf.uni-stuttgart.de>
 License: GPL-2+
 
-Files: Makefile.in,
-	./config.rpath,
+Files: ./config.rpath,
 	./m4/*.m4,
 Copyright: 1995-2006, Free Software Foundation, Inc
 License: other-GAP
 
-Files: ./config.guess,
-	./config.sub,
-	./depcomp
-	./missing
-Copyright: 1992-2008, 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.
-
 Files: ./lib/targa.[ch]
 Copyright: 2001-2003, Emil Mikulic
 License: other-targa
 
-Files: ./lib/os.c
-Copyright: 1983, 1990, 1993, The Regents of the University of California
-	2001, - 2010, Members of the Gmerlin project
-License: BSD-4 and GPL-2+
- FIXME
+Files: ./lib/base64.c
+Copyright: 1991, Bell Communications Research, Inc. (Bellcore)
+	1998-2000, University College London
+License: BSD-3 and other-Bellcore
 
-Files: ./include/bgav_sem.h
-Copyright: 1996-1997, HD Associates, Inc.
-	2001-2010, Members of the Gmerlin project
-License: BSD-4 and GPL-2+
+Files: ./lib/os_inet_aton.c
+Copyright: 1983, 1990, 1993, The Regents of the University of California
+License: BSD-4
  FIXME
 
-Files: configure
-Copyright: 1992-2001, 2003-2005, 2009, Free Software Foundation, Inc
-License: other-GAP-configure
-
-Files: aclocal.m4
-Copyright: 1996-2009, Free Software Foundation, Inc
-License: other-GAP and GPL-2+
-
-Files: ./ltmain.sh
-Copyright: 1996-2001, 2003-2007, 2008 Free Software Foundation, Inc
-License: GPL-2+ with Libtool exception
- As a special exception to the GNU General Public License, if you
- distribute this file as part of a program or library that is built
- using GNU Libtool, you may include this file under the same
- distribution terms that you use for the rest of that program.
-
 Files: ./include/RTjpeg.[ch]
 Copyright: 1998-1999, Joerg Walter <trouble at moes.pmnet.uni-oldenburg.de>
 	1999, Wim Taymans <wim.taymans at tvd.be>
 	Justin Schoeman 1998 <justin at suntiger.ee.up.ac.za>
 License: LGPL-2.1+
 
-Files: install-sh
-Copyright: 1994, X Consortium
-License: Expat and other-X
-
-Files: ./lib/base64.c
-Copyright: 1991 Bell Communications Research, Inc. (Bellcore)
-	1998-2000, University College London
-License: Other-BSD-4-UCL and other-Bellcore
- FIXME
-
 Files: ./po/Makefile.in.in
 Copyright: 1995-1997, 2000-2006, Ulrich Drepper <drepper at gnu.ai.mit.edu>
 License: other-GAP-gettext
@@ -120,6 +80,42 @@ License: LGPL-2.1+
  License along with this program.  If not, see
  <http://www.gnu.org/licenses/>.
 
+License: BSD-3
+ Redistribution and use in source and binary forms, with or without
+ modification, is 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. Neither the names of the copyright holders 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 REGENTS 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.
+
+License: other-Bellcore
+ Permission to use, copy, modify, and distribute this material for any
+ purpose and without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies, and
+ that the name of Bellcore not be used in advertising or publicity
+ pertaining to this material without the specific, prior written
+ permission of an authorized representative of Bellcore.  BELLCORE MAKES
+ NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY OF THIS MATERIAL
+ FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
+ IMPLIED WARRANTIES.
+
 License: other-GAP
  This file is free software; the Free Software Foundation gives
  unlimited permission to copy and/or distribute it, with or without
@@ -150,32 +146,3 @@ License: other-targa
  .
  This code is provided without any warranty.  The copyright holder is
  not liable for anything bad that might happen as a result of the code.
-
-License: Expat
- 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.
- .
- 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 AUTHORS OR COPYRIGHT HOLDERS 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.
- .
- Some files differ from above by replacing "The authors or copyright
- holders" with more specific term.
-
-License: other-X
- 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.

-- 
gmerlin-avdecoder packaging

