[openjk] 02/11: Update copyright file based on upstream feedback
Simon McVittie
smcv at debian.org
Sun Jan 4 21:54:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository openjk.
commit 681979ee676fa46fc6141d9de9a8ba1583f6ca8a
Author: Simon McVittie <smcv at debian.org>
Date: Sat Jan 3 01:38:10 2015 +0000
Update copyright file based on upstream feedback
---
debian/copyright | 132 +++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 100 insertions(+), 32 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index ff66f56..ee5aa31 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
Format: http://dep.debian.net/deps/dep5/
Upstream-Name: OpenJK
Source: https://github.com/JACoders/OpenJK/
+License: GPL-2
Files-Excluded:
CMakeModules/FindJPEG.cmake
CMakeModules/FindPNG.cmake
@@ -21,16 +22,55 @@ Files-Excluded:
tools/maptool
tools/pngtgaTool
Comment:
- Many files do not indicate a specific copyright holder or license,
- but appear to have been written by either Activision or Raven Software
- and were included in the GPL-2+ release of these game engines:
- <http://www.kotaku.com.au/2013/04/in-tribute-to-lucasarts-raven-releases-the-source-code-for-jedi-knight-ii/>
+ OpenJK is a combination of files originally released under either GPL-2+ or
+ GPL-2 in several Quake 3 engine forks: Jedi Knight II: Jedi Outcast, its
+ sequel Jedi Academy's single-player and multiplayer engines (which
+ are separate codebases), and Quake III Arena (via ioquake3).
+ .
+ ==== LICENSE GRANT AND OVERALL LICENSE ====
+ .
+ From README.md:
+ .
+ OpenJK is licensed under GPLv2 as free software. You are free to use,
+ modify and redistribute OpenJK following the terms in LICENSE.txt.
+ .
+ Many files do not indicate a specific copyright holder or license at a
+ per-file level, but appear to have been written by either Activision or
+ Raven Software and were included in the GPL-2 release of these game engines
+ described at
+ <http://www.kotaku.com.au/2013/04/in-tribute-to-lucasarts-raven-releases-the-source-code-for-jedi-knight-ii/>.
+ .
+ The original license grant from James Monroe at Raven Software can be seen at
+ <http://sourceforge.net/u/richwhitehouse/jediacademy/ci/c141658a69a44c9f986d225a8917b5c84bf7c3d0/tree/>:
+ .
+ Activision and Raven are releasing this code for people to learn from
+ and play with. This code is copyright Activision 2003. This source is
+ released under GNU GPLv2.
+ .
+ Some source code in this release is not covered by the GPL: e.g.
+ zlib is Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
+ (etc.)
.
The original GPL code-drop was withdrawn from Sourceforge due to its
- inclusion of third-party "Bink" and "Feelit" libraries, but OpenJK
- does not distribute these. Clarification from one of the Jedi Academy
- developers:
- <http://forums.inside3d.com/viewtopic.php?p=48995#p48995>
+ inclusion of non-GPL third-party libraries, but OpenJK does not
+ distribute these. Further information:
+ .
+ https://web.archive.org/web/20130411025317/http://jkhub.org/topic/1941-jedi-academy-and-jedi-outcast-source-code-released/page-6#entry23475
+ "Jedi Knight 2 and Jedi Academy repos have been pulled officially by
+ Raven. Raven will not disclose exactly why the repos were pulled down,
+ in order to not draw further attention to the issue. The coding community
+ is well aware of the issue and we've been proactive in eliminating any
+ further concern with it. [...] OpenJK is still up/unaffected by
+ these problems"
+ .
+ https://web.archive.org/web/20130411025317/http://jkhub.org/topic/1941-jedi-academy-and-jedi-outcast-source-code-released/page-6#entry23486
+ "The MP3 code is [not a copyright problem because it is] apparently GPL,
+ which means Raven should have released the source 10 years ago.
+ The Xbox stuff that is still left in is fine - but the original upload
+ containing the full xbox port probably is not.
+ They've already removed Feelit and Bink from their repo"
+ .
+ ==== EXCLUDED FILES ====
.
All of the excluded files appear to be free software and GPL-compatible,
with the possible exception of the EAX implementation, but they have been
@@ -45,27 +85,43 @@ Comment:
glext.h is only used on Windows, and the copy bundled in OpenJK is
under an annoyingly verbose license.
.
- sys_loadlib.h was copied from ioquake3 via one of the Return to
- Castle Wolfenstein family of engines, where it acquired GPL-3+ license
- headers with additional terms. In Debian we apply a patch to replace
- this file with a functionally identical one under GPL-2+,
- taken directly from ioquake3.
- .
The tools directory is not needed for the main OpenJK build, apart from
Ibize which contributes one header file.
Files: *
Copyright:
- © 1997-1998 Andrew Tridgell
© 1999-2005 Id Software, Inc.
© 2000-2013 Raven Software, Inc.
© 2002-2013 Activision
- © 2013 OpenJK
+ © 2013-2014 OpenJK
+License: GPL-2
+
+Files:
+ code*/macosx/macosx_glimp.h
+ code*/macosx/macosx_qgl.h
+ code*/sdl/sdl_snd.cpp
+ codemp/client/cl_avi.cpp
+ codemp/qcommon/md4.cpp
+Copyright:
+License:
+ © 1997-1998 Andrew Tridgell
+ © 1999-2005 Id Software, Inc.
© 2005-2006 Tim Angus
- © unspecified ioquake3 contributors
License: GPL-2+
Files:
+ code/mp3code/*
+ codemp/mp3code/*
+Copyright:
+ © 1995-1997 Xing Technology
+ © 1998-1999 EMusic.com
+License: GPL-2+
+Comment:
+ Apparently taken from "FreeAmp - The Free MP3 Player", which was
+ later renamed to Zinf due to trademark issues, and was in Debian
+ under that name until it was removed due to unfixed bugs in 2007.
+
+Files:
CMakeModules/FindSDL2.cmake
Copyright:
© 2003-2009 Kitware, Inc.
@@ -78,19 +134,11 @@ Copyright:
License: boost
Files:
- code/mp3code/*
- codemp/mp3code/*
-Copyright:
- © 1995-1997 Xing Technology
- © 1998-1999 EMusic.com
-License: GPL-2+
-
-Files:
code/qcommon/md4.cpp
Copyright:
© 1990-1992 RSA Data Security, Inc.
© 2001-2013 Raven Software
-License: GPL-2+ and RSA-MD4
+License: GPL-2 and RSA-MD4
Files:
tools/Ibize/md4.c
@@ -114,11 +162,10 @@ License: zlib
# ==== LICENSE TEXTS ===================================================
-License: GPL-2+
+License: GPL-2
Jedi Academy 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.
+ it under the terms of the GNU General Public License version 2
+ as published by the Free Software Foundation.
.
Jedi Academy is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -130,8 +177,29 @@ License: GPL-2+
Comment:
See /usr/share/common-licenses/GPL-2 for a copy of the GPL version 2.
.
- Some files have variations of this license grant naming a different
- project instead of Jedi Academy, such as Quake III Arena.
+ Some files have the same license grant but with "Jedi Academy" replaced
+ by "Jedi Knight 2" or "OpenJK".
+
+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; either version 2 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Comment:
+ See /usr/share/common-licenses/GPL-2 for a copy of the GPL version 2.
+ .
+ Some files have the same license grant but with "This program"
+ replaced with "Quake III Arena" or similar, or with different details
+ for contacting the FSF.
License: RSA-MD4
License to copy and use this software is granted provided that it is
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list