[Pkg-voip-commits] [pjproject] 11/17: Update copyright info: Fix cover file licensed BSD-4-clause and GPL-2+ (not only GPL-2+).

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository pjproject.

commit fe781e20ae44bcee3353c370549a04d404b0ba55
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Sep 30 22:22:46 2017 +0200

    Update copyright info: Fix cover file licensed BSD-4-clause and GPL-2+ (not only GPL-2+).
---
 debian/copyright | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/debian/copyright b/debian/copyright
index 42c5ee0..7909d53 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -95,6 +95,17 @@ License-Grant:
  a copy of the License at <http://www.apache.org/licenses/LICENSE-2.0>
 License: Apache-2
 
+Files: pjlib/src/pj/sock_linux_kernel.c
+Copyright: 1983, 1993, The Regents of the University of California.
+  2003-2008, Benny Prijono <benny at prijono.org>
+  2008-2011, Teluu Inc. <http://www.teluu.com/>
+License-Grant:
+ 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.
+License: BSD-4-clause and GPL-2+
+
 Files: aconfigure
 Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
 License: FSFUL
@@ -253,6 +264,36 @@ License: NTP
  representations about the suitability of this software for any purpose.
  It is provided "as is" without express or implied warranty.
 
+License: BSD-4-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. 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: Rdisc~code
  This source code is a product of Sun Microsystems, Inc. and is provided
  for unrestricted use.  Users may copy or modify this source code

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git