[iortcw] 01/10: Use the same name for the license as in dhewm3

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository iortcw.

commit a55031b1ec1a60722c7ab5383c4ef9cbe98e852b
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Oct 2 10:28:42 2015 +0100

    Use the same name for the license as in dhewm3
---
 debian/copyright | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index feab82b..71f5b34 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://dep.debian.net/deps/dep5/
 Upstream-Name: iortcw
-License: GPL-3+-RTCW
+License: GPL-3+-with-idsoft-extra-terms
 Files-Excluded:
  */code/AL
  */code/SDL2
@@ -33,7 +33,7 @@ Files:
  *
 Copyright:
  © 1999-2010 id Software LLC, a ZeniMax Media company
-License: GPL-3+-RTCW
+License: GPL-3+-with-idsoft-extra-terms
 
 Files:
  */code/asm/ftola.asm
@@ -140,7 +140,7 @@ Copyright:
  © 1999-2010 id Software LLC, a ZeniMax Media company
  © 1992-1993 The Regents of the University of California
  © 1995 Patrick Powell
-License: GPL-3+-RTCW and BSD-3-clause and Powell-snprintf
+License: GPL-3+-with-idsoft-extra-terms and BSD-3-clause and Powell-snprintf
 
 Files:
  MP/code/qcommon/pbmd5.c
@@ -148,10 +148,13 @@ Copyright:
  © 1990, RSA Data Security, Inc.
 License: RSA-MD5
 
-License: GPL-3+-RTCW
+License: GPL-3+-with-idsoft-extra-terms
  There are two very similar license grants for code originating
  from the single-player or multiplayer engine, which are grouped
  together as one license for the purposes of this copyright file.
+ The "additional terms" are among those allowed by the GPL version 3,
+ section 7; they are the same as in the Doom 3 source code on which
+ dhewm3 and rbdoom3bfg are based.
  .
  You can find the GPL license text on a Debian system under
  /usr/share/common-licenses/GPL-3.
@@ -188,10 +191,6 @@ License: GPL-3+-RTCW
  additional terms, you may contact in writing id Software LLC, c/o
  ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
  .
- [See below for the "additional terms", which appear to be among those
- allowed by the GPL version 3, section 7. They are the same as in
- the Doom 3 source code on which dhewm3 is based.]
- .
  ==== Additional terms ================================================
  .
  [This is the single player version. The multiplayer version is

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git