[SCM] kodi/master: Update copyright info: Sort non-wildcard Files sections.

Tue Oct 10 21:19:32 UTC 2017

The following commit has been merged in the master branch:
commit d2622c209dfb13bb6f3ed6aadba954ef63ed3469
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Oct 9 22:42:56 2017 +0200

    Update copyright info: Sort non-wildcard Files sections.

diff --git a/debian/copyright b/debian/copyright
index 92373e2..5457ad3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -115,35 +115,14 @@ Files: lib/cpluff/libcpluff/docsrc/Doxyfile-*.in
 Copyright: 2007, Johannes Lehtinen <johannes.lehtinen at iki.fi>
 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
-Copyright:
-  2001, Keith Packard, member of The XFree86 Project, Inc.
-  2002, Hewlett Packard Company, Inc.
-  2006, Intel Corporation
-License: NTP~disclaimer
+Files: xbmc/dbwrappers/dataset.cpp
+ xbmc/dbwrappers/dataset.h
+ xbmc/dbwrappers/qry_dat.cpp
+ xbmc/dbwrappers/qry_dat.h
+ xbmc/dbwrappers/sqlitedataset.cpp
+ xbmc/dbwrappers/sqlitedataset.h
+Copyright: 2002,2004, Leo Seib, Hannover <leoseib at web.de>
+License: Expat
 
 Files: xbmc/addons/AudioDecoder.cpp
  xbmc/addons/AudioDecoder.h
@@ -158,42 +137,6 @@ License-Grant:
  either version 2, or (at your option) any later version.
 License: GPL-2+
 
-Files: xbmc/dbwrappers/dataset.cpp
- xbmc/dbwrappers/dataset.h
- xbmc/dbwrappers/qry_dat.cpp
- xbmc/dbwrappers/qry_dat.h
- xbmc/dbwrappers/sqlitedataset.cpp
- xbmc/dbwrappers/sqlitedataset.h
-Copyright: 2002,2004, Leo Seib, Hannover <leoseib at web.de>
-License: Expat
-
-Files: xbmc/filesystem/NptXbmcFile.cpp
-Copyright: 2002-2008, Axiomatic Systems, LLC
-License: BSD-3-clause
-
-Files: xbmc/freebsd/FreeBSDGNUReplacements.h
-Copyright: 2009, David Schultz <das at FreeBSD.org>
-License: BSD-2-clause
-
-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
  xbmc/input/XBMC_keysym.h
  xbmc/input/XBMC_mouse.h
@@ -236,6 +179,66 @@ Comment:
  FIXME: License grant bogusly refer to non-existent GPL version 2.1.
  License assumed to be GPL-2+.
 
+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/freebsd/FreeBSDGNUReplacements.h
+Copyright: 2009, David Schultz <das at FreeBSD.org>
+License: BSD-2-clause
+
+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/filesystem/NptXbmcFile.cpp
+Copyright: 2002-2008, Axiomatic Systems, LLC
+License: BSD-3-clause
+
+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: xbmc/utils/StringUtils.cpp
 Copyright:
   2005-2013, Team XBMC <http://xbmc.org/>
@@ -248,6 +251,13 @@ License-Grant:
  either version 2, or (at your option) any later version.
 License: GPL-2+
 
+Files: xbmc-xrandr.c
+Copyright:
+  2001, Keith Packard, member of The XFree86 Project, Inc.
+  2002, Hewlett Packard Company, Inc.
+  2006, Intel Corporation
+License: NTP~disclaimer
+
 Files: xbmc/utils/fstrcmp.c
 Copyright: 1997-2010, The PHP Group
 License-Grant:
@@ -261,16 +271,6 @@ License-Grant:
  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/*
 Copyright:
   2008-2009, Ouattara Oumar Aziz <wattazoum at gmail.com>

-- 
kodi packaging

