[SCM] kodi/master: Update copyright info: Fix cover file licensed BSD-4-clause and GPL-2+.

js at users.alioth.debian.org js at users.alioth.debian.org
Tue Oct 10 21:19:33 UTC 2017


The following commit has been merged in the master branch:
commit 83bf8f43e3adf367e218af971f074399fb61c55e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Oct 10 15:36:19 2017 +0200

    Update copyright info: Fix cover file licensed BSD-4-clause and GPL-2+.

diff --git a/debian/copyright b/debian/copyright
index 43c523d..74a5859 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -287,6 +287,20 @@ Files: xbmc/filesystem/NptXbmcFile.cpp
 Copyright: 2002-2008, Axiomatic Systems, LLC
 License: BSD-3-clause
 
+Files: xbmc/platform/win32/WIN32Util.cpp
+Copyright:
+  1997-1998, 2005, The NetBSD Foundation, Inc.
+  2005-2013, Team XBMC <http://xbmc.org/>
+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, or (at your option) any later version.
+License: BSD-4-clause and GPL-2+
+Comment:
+ FIXME: Incompatible licensing terms.
+
 Files: xbmc/network/websocket/sha1.hpp
 Copyright: 2007, Andy Tompkins
 License-Grant:
@@ -472,6 +486,47 @@ License: BSD-3-clause
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+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:
+  * 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.
+  * All advertising materials
+    mentioning features or use of this software must display
+    the following acknowledgement:
+      This product includes software developed
+      by the NetBSD Foundation, Inc. and its contributors.
+  * Neither the name of The NetBSD Foundation
+    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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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: BSL-1.0
  Permission is hereby granted,
  free of charge,

-- 
kodi packaging



More information about the pkg-multimedia-commits mailing list