[iortcw] 03/08: copyright: tweak wording, consistently quote SP license text as base

Simon McVittie smcv at debian.org
Fri Feb 6 11:13:33 UTC 2015


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

smcv pushed a commit to branch master
in repository iortcw.

commit 47548ba23164d1945e23288224a98de0393fc91c
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jan 10 23:44:44 2015 +0000

    copyright: tweak wording, consistently quote SP license text as base
---
 debian/copyright | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index bdef597..ae36941 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -139,13 +139,18 @@ Copyright:
 License: RSA-MD5
 
 License: GPL-3+-RTCW
- [There are two very similar license grants which are grouped together
- as one license for the purposes of this copyright file.]
+ 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.
  .
- [You can find the GPL license text on a Debian system under
- /usr/share/common-licenses/GPL-3.]
+ You can find the GPL license text on a Debian system under
+ /usr/share/common-licenses/GPL-3.
+ .
+ ==== License grant ===================================================
  .
- ==== Single player ===================================================
+ [This is the single player version. The multiplayer version is
+ identical, except for the replacement of "single player" and "SP"
+ with "multiplayer" and "MP".]
  .
  This file is part of the Return to Castle Wolfenstein single player
  GPL Source Code (‘RTCW SP Source Code’).
@@ -176,22 +181,20 @@ License: GPL-3+-RTCW
  [See below for the "additional terms", which are among those allowed by
  the GPL version 3.]
  .
- ==== Multiplayer =====================================================
- .
- [The same license grant and additional terms as single player, but with
- "single player", "SP" replaced by "multiplayer", "MP" respectively
- where used to identify the codebase.]
- .
  ==== Additional terms ================================================
  .
+ [This is the single player version. The multiplayer version is
+ identical, except for the replacement of "single player" and "SP"
+ with "multiplayer" and "MP".]
+ .
  ADDITIONAL TERMS APPLICABLE TO THE RETURN TO CASTLE WOLFENSTEIN
- MULTIPLAYER GPL SOURCE CODE.
+ SINGLE PLAYER GPL SOURCE CODE.
  .
  The following additional terms (“Additional Terms”) supplement and
  modify the GNU General Public License, Version 3 (“GPL”) applicable
- to the Return to Castle Wolfenstein multiplayer GPL Source Code (“RTCW
- MP Source Code”).  In addition to the terms and conditions of the GPL,
- the RTCW MP Source Code is subject to the further restrictions below.
+ to the Return to Castle Wolfenstein single player GPL Source Code (“RTCW
+ SP Source Code”).  In addition to the terms and conditions of the GPL,
+ the RTCW SP Source Code is subject to the further restrictions below.
  .
  1. Replacement of Section 15.  Section 15 of the GPL shall be deleted
  in its entirety and replaced with the following:
@@ -210,7 +213,7 @@ License: GPL-3+-RTCW
  2. Replacement of Section 16.  Section 16 of the GPL shall be deleted
  in its entirety and replaced with the following:
  .
- “16.	LIMITATION OF LIABILITY.
+ “16. LIMITATION OF LIABILITY.
  .
  UNDER NO CIRCUMSTANCES SHALL ANY COPYRIGHT HOLDER OR ITS AFFILIATES,
  OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED

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



More information about the Pkg-games-commits mailing list