[SCM] kodi/master: Update copyright info: Merge files by main (and other) copyright holders identically licensed.

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

The following commit has been merged in the master branch:
commit d03ff7d0dabc2efdb01eb247a724e7697e0a6659
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Oct 4 15:56:10 2017 +0200

    Update copyright info: Merge files by main (and other) copyright holders identically licensed.

diff --git a/debian/copyright b/debian/copyright
index d38e50c..41b8a79 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,9 +25,36 @@ Files-Excluded: addons/service.xbmc.versioncheck
  xbmc/win32
 
 Files: *
-Copyright: 2003-2017, Team XBMC
+Copyright:
+  the authors of ffmpeg and xvid
+  the authors of libPlatinum
+  1997-2009, Sam Lantinga
+  2000-2004, Convergence (integrated media) GmbH
+  2001-2009. The world wide DirectFB Open Source Community (directfb.org)
+  2002, d7o3g4q and RUNTiME
+  2002,2007, Frodo
+  2003, The Joker / Avalaunch team
+  2003-2017, Team XBMC
+  2003,2006-2007, Ralf Baechle (ralf at linux-mips.org)
+  2005, Free Software Foundation, Inc.
   2005-2017, Team Kodi
+  2006, elupus (Joakim Plate)
+  2006, c0diq (Sylvain Rebaud)
+  2007, jcmarshall
+  2007, vulkanr
+  2007-2008, d4rk
+  2007-2008, Eric Steil III
+  2007,2011, Tobias Arrskog
+  2008, University Heidelberg
+  2008, Wladimir J. van der Laan
+  2010, Team Boxee
+  2012, Denis Yantarev
+  2015-2016, Lauri Mylläri
+  2016, Chris Browet
 License: GPL-2+
+Comment:
+ Copyright holder "Team XboxMediaCenter" assumed
+ to be equal to "Team XBMC".
 
 Files: lib/libUPnP/Neptune/*
 Copyright: 2002-2010, Axiomatic Systems, LLC
@@ -37,22 +64,10 @@ Files: lib/libUPnP/Platinum/Source/*
 Copyright: 2004-2010, Plutinosoft, LLC
 License: GPL-2+
 
-Files: addons/*
-Copyright: 2005-2013, Team XBMC
-License: GPL-2+
-
 Files: addons/library.xbmc.addon/*
 Copyright: 2007, Ramiro Polla
 License: LGPL-2.1+
 
-Files: lib/*
-Copyright: 2005-2013, Team XBMC
-License: GPL-2+
-
-Files: lib/addons/*
-Copyright: 2012, 2013, Team XBMC
-License: GPL-2+
-
 Files: lib/cpluff/*
 Copyright: 2007, Johannes Lehtinen
 License: Expat
@@ -78,25 +93,6 @@ Files: lib/cpluff/kazlib/*
 Copyright: 1997, Kaz Kylheku <kaz at ashi.footprints.net>
 License: BSD-3-clause
 
-Files: lib/libexif/ExifParse.cpp
- lib/libexif/IptcParse.cpp
- lib/libexif/JpegParse.cpp
-Copyright: 2005-2007, Team XboxMediaCenter
-License: GPL-2+
-
-Files: tools/EventClients/*
-Copyright: 2008-2013, Team XBMC
-License: GPL-2+
-
-Files: tools/EventClients/Clients/Kodi?Send/*
-Copyright: 2009, Team XBMC
-License: GPL-2+
-
-Files: tools/EventClients/Clients/WiiRemote/*
-Copyright: 2007-2013, Team XBMC
-  2007, by Tobias Arrskog
-License: GPL-2+
-
 Files: tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.cpp
  tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h
 Copyright: 2009, by Cory Fields
@@ -106,33 +102,6 @@ Files: tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/*
 Copyright: 2006-2007, Michael Laforest
 License: GPL-3+
 
-Files: tools/EventClients/Clients/Xbox360?Controller/Xbox360Controller.cpp
- tools/EventClients/Clients/Xbox360?Controller/Xbox360Controller.h
- tools/EventClients/Clients/Xbox360?Controller/Xbox360EventClient.cpp
-Copyright: 2009-2013, Team XBMC
-License: GPL-2+
-
-Files: tools/EventClients/lib/python/ps3/keymaps.py
- tools/EventClients/lib/python/ps3/sixaxis.py
-Copyright: 2008-2013, Team XBMC
-License: GPL-2+
-
-Files: tools/Fake?Episode?Maker/*
-Copyright: 2008-2013, Team XBMC
-License: GPL-2+
-
-Files: tools/Linux/*
-Copyright: 2013, Team XBMC
-License: GPL-2+
-
-Files: tools/UpdateThumbs.py
-Copyright: 2005-2013, Team XBMC
-License: GPL-2+
-
-Files: tools/darwin/*
-Copyright: 2008-2013, Team Kodi
-License: GPL-2+
-
 Files: xbmc-xrandr.c
 Copyright: 2006, Intel Corporation
  2002, Hewlett Packard Company, Inc
@@ -156,21 +125,11 @@ License: xrandr
  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  OF THIS SOFTWARE.
 
-Files: xbmc/*
-Copyright: 2005-2014, Team XBMC
-License: GPL-2+
-
 Files: xbmc/addons/AudioEncoder.cpp
  xbmc/addons/AudioEncoder.h
 Copyright: 2013, Arne Morten Kvarving
 License: GPL-2+
 
-Files: xbmc/cores/omxplayer/OMXAudio.cpp
- xbmc/cores/omxplayer/OMXAudio.h
-Copyright: 2012, 2013, Team XBMC
-  2002, d7o3g4q and RUNTiME & by the authors of ffmpeg and xvid
-License: GPL-2+
-
 Files: xbmc/dbwrappers/dataset.cpp
  xbmc/dbwrappers/dataset.h
  xbmc/dbwrappers/qry_dat.cpp
@@ -180,58 +139,10 @@ Files: xbmc/dbwrappers/dataset.cpp
 Copyright: 2002,2004, Leo Seib, Hannover <leoseib at web.de>
 License: Expat
 
-Files: xbmc/dbwrappers/Database.cpp
- xbmc/dbwrappers/Database.h
- xbmc/dbwrappers/mysqldataset.cpp
- xbmc/dbwrappers/mysqldataset.h
-Copyright: 2005-2013, Team XBMC
-License: GPL-2+
-
-Files: xbmc/dbwrappers/DatabaseQuery.cpp
- xbmc/dbwrappers/DatabaseQuery.h
-Copyright: 2013, Team XBMC
-License: GPL-2+
-
-Files: xbmc/filesystem/File.cpp
- xbmc/filesystem/File.h
- xbmc/filesystem/IFile.cpp
- xbmc/filesystem/IFile.h
- xbmc/filesystem/ISOFile.cpp
- xbmc/filesystem/ISOFile.h
- xbmc/filesystem/PipeFile.h
-Copyright: 2002-2013, Team XBMC
-  2002, Frodo
-  ?, by the authors of ffmpeg and xvid
-License: GPL-2+
-
 Files: xbmc/filesystem/NptXbmcFile.cpp
 Copyright: 2002-2008, Axiomatic Systems, LLC
 License: BSD-3-clause
 
-Files: xbmc/filesystem/UDFDirectory.cpp
- xbmc/filesystem/UDFDirectory.h
- xbmc/filesystem/UDFFile.cpp
- xbmc/filesystem/UDFFile.h
- xbmc/filesystem/udf25.cpp
- xbmc/filesystem/udf25.h
-Copyright: 2010-2013, Team XBMC
-  2010, Team Boxee
-License: GPL-2+
-
-Files: xbmc/filesystem/UPnPDirectory.cpp
- xbmc/filesystem/UPnPDirectory.h
-Copyright: 2010-2013, Team XBMC
-  2006, c0diq (Sylvain Rebaud)
-  ?, by the authors of libPlatinum
-License: GPL-2+
-
-Files: xbmc/filesystem/iso9660.cpp
- xbmc/filesystem/iso9660.h
-Copyright: 2003-2013, Team XBMC
-  2003, The Joker
-  ?, Avalaunch team
-License: GPL-2+
-
 Files: xbmc/freebsd/*
 Copyright: 2009, David Schultz <das at FreeBSD.org>
   1991, 1992, 1995-1997, Free Software Foundation, Inc
@@ -248,58 +159,6 @@ Files: xbmc/input/XBMC_keyboard.h
 Copyright: 1997-2009, Sam Lantinga
 License: LGPL-2.1+
 
-Files: xbmc/input/linux/LinuxInputDevices.cpp
-Copyright: 2005-2013, Team XBMC
-  2001-2009, The world wide DirectFB Open Source Community (directfb.org)
-  2000-2004, Convergence (integrated media) GmbH
-License: GPL-2+
-
-Files: xbmc/network/Socket.cpp
- xbmc/network/Socket.h
-Copyright: 2008-2013, Team XBMC
-  2008, d4rk
-License: GPL-2+
-
-Files: xbmc/network/UdpClient.h
-Copyright: 2002-2013, Team XBMC
-  2002, Frodo
-  ?, by the authors of ffmpeg and xvid
-License: GPL-2+
-
-Files: xbmc/network/upnp/UPnP.cpp
- xbmc/network/upnp/UPnP.h
-Copyright: 2006-2013, Team XBMC
-  2006, c0diq (Sylvain Rebaud)
-  ?, by the authors of libPlatinum
-License: GPL-2+
-
-Files: xbmc/network/upnp/UPnPPlayer.cpp
- xbmc/network/upnp/UPnPPlayer.h
-Copyright: 2006-2013, Team XBMC
-  2006, elupus (Joakim Plate)
-License: GPL-2+
-
-Files: xbmc/powermanagement/linux/LogindUPowerSyscall.cpp
- xbmc/powermanagement/linux/LogindUPowerSyscall.h
-Copyright: 2012, Denis Yantarev
-  2005-2013, Team XBMC
-License: GPL-2+
-
-Files: xbmc/storage/IoSupport.cpp
- xbmc/storage/IoSupport.h
-Copyright: 2002-2013, Team XBMC
-  2002, Frodo
-  ?, by the authors of ffmpeg and xvid
-License: GPL-2+
-
-Files: xbmc/threads/Event.cpp
- xbmc/threads/SingleLock.h
- xbmc/threads/Thread.cpp
-Copyright: 2002-2013, Team XBMC
-  2002, Frodo
-  ?, by the authors of ffmpeg and xvid
-License: GPL-2+
-
 Files: xbmc/utils/BitstreamConverter.cpp
 Copyright: 2010-2013, Team XBMC
   2008, Wim Taymans <wim.taymans at gmail.com>
@@ -331,11 +190,6 @@ Files: xbmc/utils/fstrcmp.h
 Copyright: 1995, Free Software Foundation, Inc
 License: GPL-2+
 
-Files: xbmc/windowing/XBMC_events.h
-Copyright: 2005-2013, Team XBMC
-  1997-2009, Sam Lantinga
-License: GPL-2+
-
 Files: debian/*
 Copyright: Copyright 2008-2009 Ouattara Oumar Aziz <wattazoum at gmail.com>
            Copyright 2012-2013 Andres Mejia <amejia at debian.org>

-- 
kodi packaging

More information about the pkg-multimedia-commits mailing list