[SCM] kodi/master: Update copyright info: Fix cover files licensed FSFAP or FSFUL (or derived forms).

[js at users.alioth.debian.org]

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

    Update copyright info: Fix cover files licensed FSFAP or FSFUL (or derived forms).

diff --git a/debian/copyright b/debian/copyright
index b996c98..f251a13 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -69,7 +69,7 @@ License: Expat
 
 Files: lib/cpluff/examples/*
 Copyright: 2007, Johannes Lehtinen <johannes.lehtinen at iki.fi>
-License: FSFUL~Lehtinen
+License: FSFUL~Lehtinen~file
 
 Files: lib/cpluff/kazlib/*
 Copyright: 1997, Kaz Kylheku <kaz at ashi.footprints.net>
@@ -113,7 +113,7 @@ License: FSFUL~Lehtinen~Makefile
 
 Files: lib/cpluff/libcpluff/docsrc/Doxyfile-*.in
 Copyright: 2007, Johannes Lehtinen <johannes.lehtinen at iki.fi>
-License: FSFUL~Lehtinen
+License: FSFUL~Lehtinen~configuration
 
 Files: xbmc/dbwrappers/dataset.cpp
  xbmc/dbwrappers/dataset.h
@@ -151,6 +151,18 @@ License-Grant:
  or (at your option) any later version.
 License: LGPL-2.1+
 
+Files: m4/ax_cxx_compile_stdcxx_11.m4
+ m4/ax_prog_cxx_for_build.m4
+ m4/ax_prog_cc_for_build.m4
+Copyright:
+  2008, Benjamin Kosnik <bkoz at redhat.com>
+  2008, Paolo Bonzini <bonzini at gnu.org>
+  2012, Avionic Design GmbH
+  2012, Zack Weinberg <zackw at panix.com>
+  2013, Roy Stogner <roystgnr at ices.utexas.edu>
+  2014, Alexey Sokolov <sokolov at google.com>
+License: FSFAP
+
 Files: xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp
  xbmc/utils/BitstreamConverter.cpp
  xbmc/utils/BitstreamConverter.h
@@ -179,6 +191,11 @@ Comment:
  FIXME: License grant bogusly refer to non-existent GPL version 2.1.
  License assumed to be GPL-2+.
 
+Files: lib/cpluff/configure.ac
+ lib/cpluff/examples/configure.ac
+Copyright: 2007, Johannes Lehtinen <johannes.lehtinen at iki.fi>
+License: FSFUL~Lehtinen~configure.ac
+
 Files: tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.cpp
  tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h
 Copyright: 2009, Cory Fields
@@ -229,6 +246,10 @@ Files: xbmc/filesystem/NptXbmcFile.cpp
 Copyright: 2002-2008, Axiomatic Systems, LLC
 License: BSD-3-clause
 
+Files: lib/cpluff/po/Makefile.in.in
+Copyright: 1995-1997, 2000-2006, Ulrich Drepper <drepper at gnu.ai.mit.edu>
+License: FSFAP~noGPL
+
 Files: xbmc/utils/fstrcmp.h
 Copyright: 1995, Free Software Foundation, Inc.
 License-Grant:
@@ -387,11 +408,33 @@ License: Expat
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
  OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-License: FSFUL~Lehtinen
+License: FSFAP
+ Copying and distribution of this file,
+ with or without modification,
+ are permitted in any medium without royalty
+ provided the copyright notice and this notice are preserved.
+ This file is offered as-is, without any warranty.
+
+License: FSFAP~noGPL
+ This file can be copied and used freely without restrictions.
+ It can be used in projects which are not available
+ under the GNU General Public License
+ but which still want to provide support
+ for the GNU gettext functionality.
+ Please note that the actual code of GNU gettext is covered
+ by the GNU General Public License
+ and is *not* in the public domain.
+
+License: FSFUL~Lehtinen~configuration
  This configuration file is free software;
  Johannes Lehtinen gives unlimited permission
  to copy, distribute and modify it.
 
+License: FSFUL~Lehtinen~configure.ac
+ This configure.ac script is free software;
+ Johannes Lehtinen gives unlimited permission
+ to copy, distribute and modify it.
+
 License: FSFUL~Lehtinen~file
  This file is free software;
  Johannes Lehtinen gives unlimited permission

-- 
kodi packaging