[SCM] kodi/master: Update copyright info: Fix coverage and labeling of files licensed BSD-2-clause (or derived form).

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


The following commit has been merged in the master branch:
commit 92472357ff9348db7def1eba4dfbc4d6331b2def
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Oct 10 13:32:09 2017 +0200

    Update copyright info: Fix coverage and labeling of files licensed BSD-2-clause (or derived form).

diff --git a/debian/copyright b/debian/copyright
index f251a13..92eb479 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -124,6 +124,22 @@ Files: xbmc/dbwrappers/dataset.cpp
 Copyright: 2002,2004, Leo Seib, Hannover <leoseib at web.de>
 License: Expat
 
+Files: xbmc/platform/android/jni/JNIThreading.cpp
+ xbmc/platform/android/jni/JNIThreading.h
+ xbmc/platform/android/jni/jutils.cpp
+ xbmc/platform/android/jni/jutils/jutils-details.hpp
+ xbmc/platform/android/jni/jutils/jutils.hpp
+Copyright:
+  2005-2013, Team XBMC <http://xbmc.org/>
+  2011-2012, Dmitry Moskalchuk <dm at crystax.net>
+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-2-clause~Moskalchuk and GPL-2+
+
 Files: xbmc/addons/AudioDecoder.cpp
  xbmc/addons/AudioDecoder.h
  xbmc/addons/AudioEncoder.cpp
@@ -223,6 +239,10 @@ Files: xbmc/freebsd/FreeBSDGNUReplacements.h
 Copyright: 2009, David Schultz <das at FreeBSD.org>
 License: BSD-2-clause
 
+Files: xbmc/platform/android/jni/jutils/jni.inc
+Copyright: 2011-2012, Dmitry Moskalchuk <dm at crystax.net>
+License: BSD-2-clause~Moskalchuk
+
 Files: xbmc/freebsd/FreeBSDGNUReplacements.c
 Copyright:
   1991-1992,1995-1997,2002,2005, Free Software Foundation, Inc.
@@ -330,6 +350,36 @@ License: BSD-2-clause
     in the documentation and/or other materials
     provided with the distribution.
  .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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: BSD-2-clause~Moskalchuk
+ 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.
+ .
  THIS SOFTWARE IS PROVIDED BY Dmitry Moskalchuk "AS IS"
  AND ANY EXPRESS OR IMPLIED WARRANTIES,
  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

-- 
kodi packaging



More information about the pkg-multimedia-commits mailing list