[SCM] gmerlin-avdecoder/master: Update copyright file: Add BSD-4 license verbatim, and a comment on it not violating GPL.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 60049c6ba49da54de961d4a27c0b3d65a589209c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Dec 10 13:19:42 2010 +0100

    Update copyright file: Add BSD-4 license verbatim, and a comment on it not violating GPL.

diff --git a/debian/copyright b/debian/copyright
index 8c0b57a..3759a9b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,8 +25,17 @@ 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
- FIXME
+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>
@@ -105,6 +114,35 @@ 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

-- 
gmerlin-avdecoder packaging