[SCM] gmerlin-avdecoder/master: updated debian/copyright

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

The following commit has been merged in the master branch:
commit 3ef68db6645c161ff7467f1c3fb5a9d3bbaa6672
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Wed Jan 12 20:26:37 2011 +0100

    updated debian/copyright
    
    according to licensecheck

diff --git a/debian/copyright b/debian/copyright
index 3759a9b..148f39d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Source: http://gmerlin.sourceforge.net/
 
 Copyright: 1995-2001,2004-2006, Free Software Foundation, Inc.
 	2000-2002, the xine project
-	2001-2010, Members of the Gmerlin project
+	2001-2011, Members of the Gmerlin project
 	2003-2009, Burkhard Plaum <plaum at ipf.uni-stuttgart.de>
 License: GPL-2+
 
@@ -23,20 +23,6 @@ Copyright: 1991, Bell Communications Research, Inc. (Bellcore)
 	1998-2000, University College London
 License: BSD-3 and other-Bellcore
 
-Files: ./lib/os_inet_aton.c
-Copyright: 1983, 1990, 1993, The Regents of the University of California
-License: GPL-2+ and BSD-4
-License-Comment:
- BSD-4 licensed parts are stripped before compilation, so not used in
- any binary code and therefore does not violate GPL.
-
-Files: ./lib/os_inet_aton.c
-Copyright: 1983, 1990, 1993, The Regents of the University of California
-License: BSD-4
-License-Comment:
- BSD-4 licensed parts are stripped before compilation, so not used in
- any binary code and therefore does not violate GPL.
-
 Files: ./include/RTjpeg.[ch]
 Copyright: 1998-1999, Joerg Walter <trouble at moes.pmnet.uni-oldenburg.de>
 	1999, Wim Taymans <wim.taymans at tvd.be>
@@ -49,6 +35,10 @@ License: other-GAP-gettext
 
 Files: ./debian/*
 Copyright: 2008, Christian Marillat <marillat at debian.org>
+	2009, Romain Beauxis <toots at rastageeks.org>
+	2009-2010, Reinhard Tartler <siretart at tauware.de>
+	2010, Jonas Smedegard <dr at jones.dk>
+	2010-2011, IOhannes m zmölnig <zmoelnig at iem.at>
 License: GPL-2+
 
 License: GPL-2+
@@ -114,35 +104,6 @@ License: BSD-3
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-4
- 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. All advertising materials mentioning features or use of this
-    software must display the following acknowledgement:
-	This product includes software developed by the University of
-	California, Berkeley and its contributors.
- 4. Neither the name of the University 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 REGENTS 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
@@ -173,10 +134,6 @@ License: other-GAP-gettext
  but which still want to provide support for the GNU gettext
  functionality.
 
-License: other-GAP-configure
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
-
 License: other-targa
  Source and binary redistribution of this code, with or without changes,
  for free or for profit, is allowed as long as this copyright notice is

-- 
gmerlin-avdecoder packaging