[SCM] kodi/master: Update copyright info: Use fields License-Grant and License-Reference.

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 968b3d622e2b5e5737814f5b1c96c382671d44d1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Oct 9 20:26:46 2017 +0200

    Update copyright info: Use fields License-Grant and License-Reference.

diff --git a/debian/copyright b/debian/copyright
index 1da9a47..c9c9c6b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -52,6 +52,12 @@ Copyright:
   2012, Denis Yantarev
   2015-2016, Lauri Mylläri
   2016, Chris Browet
+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: GPL-2+
 Comment:
  Copyright holder "Team XboxMediaCenter" assumed
@@ -79,10 +85,22 @@ License: BSD-3-clause
 
 Files: lib/libUPnP/Platinum/Source/*
 Copyright: 2004-2010, Plutinosoft, LLC
+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: GPL-2+
 
 Files: tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/*
 Copyright: 2006-2007, Michael Laforest (para) <thepara at gmail.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 3 of the License, or (at your option) any later version.
 License: GPL-3+
 
 Files: lib/cpluff/*/autogen.sh
@@ -100,11 +118,23 @@ License: FSFUL~Lehtinen
 Files: tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.cpp
  tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h
 Copyright: 2009, Cory Fields
+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 3 of the License, or (at your option) any later version.
 License: GPL-3+
 
 Files: xbmc/addons/kodi-addon-dev-kit/include/kodi/dlfcn-win32.cpp
  xbmc/addons/kodi-addon-dev-kit/include/kodi/dlfcn-win32.h
 Copyright: 2007, Ramiro Polla
+License-Grant:
+ This library is free software;
+ you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License
+ as published by the Free Software Foundation;
+ either version 2.1 of the License, or (at your option) any later version.
 License: LGPL-2.1+
 
 Files: xbmc-xrandr.c
@@ -136,6 +166,12 @@ Files: xbmc/addons/AudioDecoder.cpp
  xbmc/addons/AudioEncoder.cpp
  xbmc/addons/AudioEncoder.h
 Copyright: 2013, Arne Morten Kvarving (cptspiff)
+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: GPL-2+
 
 Files: xbmc/dbwrappers/dataset.cpp
@@ -159,6 +195,18 @@ Files: xbmc/freebsd/FreeBSDGNUReplacements.c
 Copyright:
   1991-1992,1995-1997,2002,2005, Free Software Foundation, Inc.
   2009, David Schultz <das at FreeBSD.org>
+License-Grant:
+ The GNU C Library is free software;
+ you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License
+ as published by the Free Software Foundation;
+ either version 2 of the License, or (at your option) any later version.
+License-Grant:
+ Libiberty is free software;
+ you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License
+ as published by the Free Software Foundation;
+ either version 2.1 of the License, or (at your option) any later version.
 License: BSD-2-clause and LGPL-2+ and LGPL-2.1+
 
 Files: xbmc/input/XBMC_keyboard.h
@@ -166,6 +214,12 @@ Files: xbmc/input/XBMC_keyboard.h
  xbmc/input/XBMC_mouse.h
  xbmc/input/XBMC_vkeys.h
 Copyright: 1997-2009, Sam Lantinga <slouken at libsdl.org>
+License-Grant:
+ This library is free software;
+ you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License
+ as published by the Free Software Foundation;
+ either version 2.1 of the License, or (at your option) any later version.
 License: LGPL-2.1+
 
 Files: xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp
@@ -177,6 +231,20 @@ Copyright:
   2007, Benoit Fouet <benoit.fouet at free.fr>
   2008, Wim Taymans <wim.taymans at gmail.com>
   2010-2015, 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-Grant:
+ License as published by the Free Software Foundation;
+ either version 2.1 of the License,
+ or (at your option) any later version.
+License-Grant:
+ based on h264_mp4toannexb_bsf.c (ffmpeg)
+ which is Copyright (c) 2007 Benoit Fouet <benoit.fouet at free.fr>
+ and Licensed GPL 2.1 or greater
 License: GPL-2+
 Comment:
  FIXME: License grant bogusly refer to non-existent GPL version 2.1.
@@ -186,11 +254,17 @@ Files: xbmc/utils/StringUtils.cpp
 Copyright:
   2005-2013, Team XBMC <http://xbmc.org/>
   2012, Leigh Brasington
+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: GPL-2+
 
 Files: xbmc/utils/fstrcmp.c
 Copyright: 1997-2010, The PHP Group
-License: PHP-3.01
+License-Grant:
  This source file is subject to version 3.01 of the PHP license,
  that is bundled with this package in the file LICENSE, and is
  available through the world-wide-web at the following url:
@@ -198,9 +272,16 @@ License: PHP-3.01
  If you did not receive a copy of the PHP license and are unable to
  obtain it through the world-wide-web, please send a note to
  license at php.net so we can mail you a copy immediately.
+License: PHP-3.01
 
 Files: xbmc/utils/fstrcmp.h
 Copyright: 1995, Free Software Foundation, Inc.
+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: GPL-2+
 
 Files: debian/*
@@ -208,28 +289,25 @@ Copyright:
   2008-2009, Ouattara Oumar Aziz <wattazoum at gmail.com>
   2012-2013, Andres Mejia <amejia at debian.org>
   2014-2015, Balint Reczey <balint at balintreczey.hu>
+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;
+ version 2 dated June, 1991, or (at your option) any later version.
 License: GPL-2+
 
 Files: debian/from-debian-logo.svg
 Copyright:
   1999, Software in the Public Interest, Inc.
   2015, Balint Reczey <balint at balintreczey.hu>
+License-Grant:
+ This package is free software;
+ you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License
+ as published by the Free Software Foundation;
+ either version 3 of the License, or (at your option) any later version.
 License: LGPL-3+
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 3 of the License, or (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in "/usr/share/common-licenses/LGPL-3".
 
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without modification, are
@@ -275,41 +353,13 @@ License: BSD-3-clause
  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 License: GPL-2+
- 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; version 2 dated June, 1991, or (at
- your option) any later version.
- .
- On Debian systems, the complete text of version 2 of the GNU General
- Public License can be found in '/usr/share/common-licenses/GPL-2'.
+License-Reference: /usr/share/common-licenses/GPL-2
 
 License: LGPL-2.1+
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by the
- Free Software Foundation; version 2.1 of the License, or (at
- your option) any later version.
- .
- On Debian systems, the complete text of version 2.1 of the GNU Lesser
- General Public License can be found in
- `/usr/share/common-licenses/LGPL-2.1'.
+License-Reference: /usr/share/common-licenses/LGPL-2.1
 
 License: GPL-3+
- 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 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the
- GNU General Public License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.
+License-Reference: /usr/share/common-licenses/GPL-3
 
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy

-- 
kodi packaging

More information about the pkg-multimedia-commits mailing list