[SCM] kodi/master: Update copyright info: Fix cover files licensed GPL-2+ or LGPL-2.1+ or MPL-1.1.

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 07ab95fb7c83e2beb7d277d35d7f5d28f9a73ad6
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Oct 10 18:53:50 2017 +0200

    Update copyright info: Fix cover files licensed GPL-2+ or LGPL-2.1+ or MPL-1.1.

diff --git a/debian/copyright b/debian/copyright
index 35e40b1..aaf81bf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -252,6 +252,42 @@ Files: lib/cpluff/configure.ac
 Copyright: 2007, Johannes Lehtinen <johannes.lehtinen at iki.fi>
 License: FSFUL~Lehtinen~configure.ac
 
+Files: xbmc/platform/android/activity/GraphicBuffer.cpp
+ xbmc/platform/android/activity/GraphicBuffer.h
+Copyright:
+  2005-2013, Team XBMC <http://xbmc.org/>
+  2009, Mozilla Foundation
+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-Grant:
+ The contents of this file are subject
+ to the Mozilla Public License Version 1.1 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at <http://www.mozilla.org/MPL/>
+License-Grant:
+ Alternatively, the contents of this file may be used under the terms
+ of either the GNU General Public License Version 2 or later
+ (the "GPL"),
+ or the GNU Lesser General Public License Version 2.1 or later
+ (the "LGPL"),
+ in which case the provisions of the GPL or the LGPL are applicable
+ instead of those above.
+ If you wish to allow use of your version of this file
+ only under the terms of either the GPL or the LGPL,
+ and not to allow others to use your version of this file
+ under the terms of the MPL,
+ indicate your decision by deleting the provisions above
+ and replace them with the notice and other provisions
+ required by the GPL or the LGPL.
+ If you do not delete the provisions above,
+ a recipient may use your version of this file under the terms
+ of any one of the MPL, the GPL or the LGPL.
+License: GPL-2+ or LGPL-2.1+ or MPL-1.1
+
 Files: tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.cpp
  tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h
 Copyright: 2009, Cory Fields
@@ -1764,6 +1800,9 @@ License: Kazlib
 License: LGPL-2.1+
 License-Reference: /usr/share/common-licenses/LGPL-2.1
 
+License: MPL-1.1
+License-Reference: /usr/share/common-licenses/MPL-1.1
+
 License: NTP~disclaimer
  Permission to use, copy, modify, distribute, and sell
  this software and its documentation

-- 
kodi packaging



More information about the pkg-multimedia-commits mailing list