This is an automated email from the git hooks/post-receive script. jcowgill-guest pushed a commit to branch experimental in repository dolphin-emu.
commit 5d7f6cbfcc1e70bfe0982d561bf86ce5bd9a32a4 Author: James Cowgill <james...@cowgill.org.uk> Date: Wed Sep 16 18:00:48 2015 +0100 Update debian/copyright --- debian/copyright | 267 ++++++++++++++----------------------------------------- 1 file changed, 69 insertions(+), 198 deletions(-) diff --git a/debian/copyright b/debian/copyright index c58c2ee..51857a5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: http://dolphin-emu.org/ Upstream-Name: Dolphin Emulator Upstream-Contact: http://forums.dolphin-emu.org/ - http://code.google.com/p/dolphin-emu/people/list Files-Excluded: Externals/LZO Externals/OpenAL @@ -27,8 +26,8 @@ Files-Excluded: docs/WiiMote/HID_SPEC_V10.rar Files: * -Copyright: 2003-2013, Dolphin Emulator Project -License: GPL-2 +Copyright: 2003-2015, Dolphin Emulator Project +License: GPL-2+ Comment: Clarification of the sources of shipped binaries: Data/Sys/GC/dsp_* @@ -47,157 +46,104 @@ Comment: debugger. This file format can be read / generated from within dolphin-emu (but the data itself took some time to find). -Files: Source/Core/AudioCommon/Src/aldlist.cpp -Copyright: 2006, Creative Labs Inc. -License: BSD-3-clause-Creative +Files: Externals/Bochs_disasm/* +Copyright: Bochs Emulator Project, http://bochs.sourceforge.net/ +License: LGPL-2.1+ + +Files: Externals/GL/* +Copyright: + 1999-2006, Brian Paul + 2009 VMware, Inc. + 2013-2014, The Khronos Group Inc. + 2015, Dolphin Emulator Project +License: GPL-2+ + +Files: Externals/xxhash/* +Copyright: 2012-2014, Yann Collet +License: BSD-2-clause + +Files: Externals/xxhash/xxhsum.c +Copyright: 2012-2014, Yann Collet +License: GPL-2+ -Files: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.h +Files: Source/Android/android.toolchain.cmake +Copyright: + 2010-2011, Ethan Rublee + 2011-2014, Andrey Kamaev +License: BSD-3-clause + +Files: Source/Core/AudioCommon/aldlist.cpp +Copyright: + 2006, Creative Labs Inc. + 2009, Dolphin Emulator Project +License: GPL-2+ + +Files: Source/Core/Core/HW/BBA-TAP/TAP_Win32.h Copyright: 2002-2005, OpenVPN Solutions LLC 2003, Damion K. Wilson License: GPL-2 +Comment: File is not used in Debian's build so it doesn't need to be GPL-2+ -Files: Source/Core/Core/Src/HW/WiimoteEmu/Encryption.* +Files: Source/Core/Core/HW/WiimoteEmu/Encryption.* Copyright: 2013, Dolphin Emulator Project Hector Martin <hec...@marcansoft.com> -License: GPL-2 +License: GPL-2+ -Files: Source/Core/Core/Src/ARDecrypt.cpp +Files: Source/Core/Core/ARDecrypt.cpp Copyright: 2013, Dolphin Emulator Project 2003-2004, Parasyte -License: GPL-2 +License: GPL-2+ Files: - Source/Core/Core/Src/IPC_HLE/l2cap.h - Source/Core/Core/Src/IPC_HLE/hci.h + Source/Core/Core/IPC_HLE/l2cap.h + Source/Core/Core/IPC_HLE/hci.h Copyright: - 2005, Iain Hibbert. + 2008, Dolphin Emulator Project 2006, Itronix Inc. + 2005, Iain Hibbert. 2001, Maksim Yevmenkin <m_evmen...@yahoo.com> -License: BSD-3-clause-Itronix and BSD-2-clause - -Files: Source/Core/Common/Src/SDCardUtil.cpp -Copyright: 2007, The Android Open Source Project -License: BSD-3-clause-Google - -Files: Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp -Copyright: - 2013, Dolphin Emulator Project - 2007-2008, Markus Trenkwalder -License: GPL-2 and BSD-3-clause-Generic - -Files: - Source/Core/Core/Src/DSP/DSPIntExtOps.h - Source/Core/Core/Src/DSP/DSPIntUtil.h - Source/Core/Core/Src/DSP/assemble.* - Source/Core/Core/Src/DSP/disassemble.* - docs/DSP/DSP_InterC/DSP_InterC/DSPExt.* - docs/DSP/DSP_InterC/DSP_InterC/gdsp_opcodes_helper.h -Copyright: - 2005, Duddie <dud...@walla.com> License: GPL-2+ -Files: - Source/Core/Core/Src/DSP/DSPCore.* - Source/Core/Core/Src/DSP/DSPHWInterface.* - Source/Core/Core/Src/DSP/DSPInterpreter.cpp - Source/Core/Core/Src/DSP/DSPMemoryMap.* - Source/Core/Core/Src/DSP/DSPStacks.* - docs/DSP/DSP_InterC/DSP_InterC/DSPOpcodes.h +Files: Source/Core/Common/SDCardUtil.cpp Copyright: - 2005, Duddie <dud...@wall.com> & Tratax + 2009, Dolphin Emulator Project + 2007, The Android Open Source Project License: GPL-2+ -Files: Source/Core/Core/Src/DSP/DSPTables.* +Files: Source/Core/VideoBackends/Software/Clipper.cpp Copyright: - 2013, Dolphin Emulator Project - 2005, Duddie <dud...@walla.com> -License: GPL-2 - -Files: - Source/Core/Core/Src/DSP/DSPIntCCUtil.* - Source/Core/Core/Src/DSP/DspIntArithmetic.cpp - Source/Core/Core/Src/DSP/DspIntBranch.cpp - Source/Core/Core/Src/DSP/DspIntLoadStore.cpp - Source/Core/Core/Src/DSP/DspIntMisc.cpp - Source/Core/Core/Src/DSP/DspIntMultiplier.cpp -Copyright: - 2013, Dolphin Emulator Project - 2004, Duddie <dud...@walla.com> & Tratax -License: GPL-2 - -Files: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp -Copyright: - 2003-2009, Dolphin Emulator Project - 2007-2008, Segher Boessenkool <seg...@kernel.crashing.org> -License: GPL-2 - -Files: Source/Core/VideoCommon/Src/memcpy_amd.cpp -Copyright: - 2001, Advanced Micro Devices, Inc. -License: Permissive - LIMITATION OF LIABILITY: THE MATERIALS ARE PROVIDED *AS IS* WITHOUT ANY - EXPRESS OR IMPLIED WARRANTY OF ANY KIND INCLUDING WARRANTIES OF - MERCHANTABILITY, NONINFRINGEMENT OF THIRD-PARTY INTELLECTUAL PROPERTY, OR - FITNESS FOR ANY PARTICULAR PURPOSE. IN NO EVENT SHALL AMD OR ITS SUPPLIERS BE - LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR - LOSS OF PROFITS, BUSINESS INTERRUPTION, LOSS OF INFORMATION) ARISING OUT OF - THE USE OF OR INABILITY TO USE THE MATERIALS, EVEN IF AMD HAS BEEN ADVISED OF - THE POSSIBILITY OF SUCH DAMAGES. BECAUSE SOME JURISDICTIONS PROHIBIT THE - EXCLUSION OR LIMITATION OF LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, - THE ABOVE LIMITATION MAY NOT APPLY TO YOU. - . - AMD does not assume any responsibility for any errors which may appear in the - Materials nor any responsibility to support or update the Materials. AMD - retains the right to make changes to its test specifications at any time, - without notice. - . - NO SUPPORT OBLIGATION: AMD is not obligated to furnish, support, or make any - further information, software, technical information, know-how, or show-how - available to you. - . - So that all may benefit from your experience, please report any problems - or suggestions about this software to 3dsdk.supp...@amd.com - . - AMD Developer Technologies, M/S 585 - Advanced Micro Devices, Inc. - 5900 E. Ben White Blvd. - Austin, TX 78741 - 3dsdk.supp...@amd.com + 2009, Dolphin Emulator Project + 2007-2008, Markus Trenkwalder +License: GPL-2+ Files: - Source/Core/Common/Src/Crypto/bn.cpp - Source/Core/Common/Src/Crypto/ec.cpp - Source/Core/Common/Src/Crypto/tools.h + Source/Core/Core/HW/WiiSaveCrypted.cpp + Source/Core/Common/Crypto/* Copyright: + 2010, Dolphin Emulator Project 2007-2008, Segher Boessenkool <seg...@kernel.crashing.org> -License: GPL-2 +License: GPL-2+ -Files: Externals/Bochs_disasm/* -Copyright: Bochs Emulator Project, http://bochs.sourceforge.net/ -License: LGPL-2.1 - -Files: debian/* -Copyright: - 2015, James Cowgill <james...@cowgill.org.uk> - 2013-2014, Brandon Barnes <winterkni...@email.com> - 2010-2013, Glenn Rice <glennrics...@gmail.com> -License: GPL-2 +Files: Source/DSPTool/Testdata/hermes.* +Copyright: 2008 Hermes <www.entuwii.net> +License: BSD-3-clause Files: - debian/gc-fonts/font_ansi.bin - debian/gc-fonts/font_sjis.bin + Data/Sys/GC/font_ansi.bin + Data/Sys/GC/font_sjis.bin Copyright: 2006-2014, Google Corporation License: Apache-2.0 Comment: Font file generated from "Droid Sans" using gc-font-tool. -Files: debian/gc-fonts/gc-font-tool.cpp +Files: debian/* Copyright: - 2015, Dolphin Emulator Project 2015, James Cowgill <james...@cowgill.org.uk> + 2013-2014, Brandon Barnes <winterkni...@email.com> + 2010-2013, Glenn Rice <glennrics...@gmail.com> License: GPL-2+ Files: @@ -205,7 +151,6 @@ Files: Data/Sys/codehandler.bin Copyright: 2011 Nuke, brkirch, Y.S, Kenobi License: Expat -Comment: Downloaded from https://code.google.com/p/geckodownloads/ Files: docs/DSP/GC_DSP.pdf Copyright: 2005, Duddie <dud...@walla.com> @@ -249,7 +194,7 @@ License: BSD-2-clause OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License: BSD-3-clause-Creative +License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . @@ -258,8 +203,8 @@ License: BSD-3-clause-Creative * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Creative Labs Inc. nor the names of its contributors may - be used to endorse or promote products derived from this software without + * Neither the name of the copyright holder nor the names of its contributors + may be used to endorse or promote products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND @@ -273,81 +218,6 @@ License: BSD-3-clause-Creative (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License: BSD-3-clause-Generic - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - . - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - . - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - . - * Neither the name of the library's copyright owner nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -License: BSD-3-clause-Google - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of Google Inc. nor the names of its contributors may - be used to endorse or promote products derived from this software - without specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY Google Inc. ``AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO - EVENT SHALL Google Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -License: BSD-3-clause-Itronix - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. The name of Itronix Inc. may not be used to endorse - or promote products derived from this software without specific - prior written permission. - . - THIS SOFTWARE IS PROVIDED BY ITRONIX INC. ``AS IS'' AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ITRONIX INC. BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and/or associated documentation files (the @@ -413,15 +283,16 @@ License: GPL-2+ On Debian systems, the complete text of the GNU General Public License version 2 can be found in '/usr/share/common-licenses/GPL-2'. -License: LGPL-2.1 +License: LGPL-2.1+ 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, version 2.1. + published by the Free Software Foundation; either version 2.1 of the License, + or (at your option) any later version. . This library 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 2.1 for more details. + Lesser General Public License for more details. . You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dolphin-emu.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits