[redeclipse] 266/494: unfinished update of copyright

[Martin Werner]

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

arand-guest pushed a commit to branch debdir
in repository redeclipse.

commit 0ade66b7ad566a773f8afb437d04b2103614f8fb
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Wed Nov 30 00:57:51 2011 +0100

    unfinished update of copyright
---
 copyright | 76 ++++-----------------------------------------------------------
 1 file changed, 4 insertions(+), 72 deletions(-)

diff --git a/copyright b/copyright
index ee53ca8..9aae650 100644
--- a/copyright
+++ b/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/copyright-format/1.0
+Format: http://dep.debian.net/deps/dep5/
 Upstream-Name: Red Eclipse
 Upstream-Contact: Quinton "Quin" Reeves <qreeves at gmail.com>
                   Lee "Eihrul" Salzman <lsalzman at gmail.com>
@@ -7,40 +7,10 @@ Source: https://redeclipse.svn.sourceforge.net
  from the source.
  The header files here are already shipped within other Debian packages, or are
  unnecessary on GNU/Linux.
-Disclaimer:
- This package is not part of Debian due to some of the game data not being in
- "the preferred format for modification" (e.g. pre-rendered music) which would
- be required by the Debian Free Software Guidelines (DFSG).
 
 Files: *
-Copyright: Copyright (C) 2009-2011 Red Eclipse Team
-License:
- Limited rights are granted to redistribute and/or recompress the entire
- distribution using different archival/binary formats suitable for your OS
- (zip/tgz/deb/dmg), any changes beyond that require explicit permission from the
- developers.
- .
- Use of any logos, trademarks, or other advertising/promotional material for
- Red Eclipse are free to use without consent, when used in conjunction with
- a Red Eclipse article, comment, review, advertisement, or redistribution of
- the game; regardless of the media featured in said material. Use for any other
- reason is strictly prohibited without express written consent of Red Eclipse.
- .
- Special permission has been granted to me (Arand Nash) to package Red Eclipse
- in my PPA: https://launchpad.net/~arand/+archive/redeclipse
- This includes permission to:
- * Redistribute Red Eclipse split into separate binary packages.
- * Redistribute Red Eclipse with modifications in the binary packages, namely:
-   - Debian packaging data.
-   - New compiled binaries.
-   - Removal of data not used for installation.
-   - Reorganisation of files into install locations.
- * To use the name "Red Eclipse" and the Red Eclipse logo in conjunction with
-   redistribution of these packages.
- * To modify the Red Eclipse logo for use in the client binary package, to
-   supply menu icons.
- * To redistribute the packaged work under similar terms as that of the
-   original license, see above.
+Copyright: Copyright 2009-2011 Red Eclipse Team
+License: CC-BY-SA-3.0
 
 Files: src/*
 Copyright: Copyright (C) 2009-2011 Quinton Reeves, Lee Salzman
@@ -243,21 +213,6 @@ License:
  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  PARTICULAR PURPOSE.
 
-Files: src/redeclipse.ico src/install/large.gif
-       src/redeclipse.ico src/install/small.gif src/site/*
-       data/textures/emblem.png data/textures/logo.png
-Copyright: Copyright Copyright (C) 2010 Red Eclipse Team
-License:
- Use of any logos, trademarks, or other advertising/promotional material
- for Red Eclipse are free to use without consent, when used in conjunction with
- a Red Eclipse article, comment, review, or advertisement or redistribution of
- the game; regardless of the media featured in said material. Use for any other
- reason is strictly prohibited without express written consent of Red Eclipse.
-
-Files: data/*
-Copyright: Copyright 2009-2011 Red Eclipse Team
-License: CC-BY-SA-3.0
-
 Files: data/jwin/*
 Copyright: Copyright JWindecker <jacobwindecker at hotmail.com>
 License: CC-BY-3.0
@@ -546,30 +501,7 @@ License: Zlib
 
 Files: debian/*
 Copyright: Copyright (C) 2011 Arand Nash <ienorand at gmail.com>
-License: custom and Expat
- This package was debianized by Arand Nash, the packaging is licensed under the
- MIT Expat license.
- .
- This does not include the name "Red Eclipse" used in the debian packaging which
- falls under a separate license:
- .
- Use of any logos, trademarks, or other advertising/promotional material for
- Red Eclipse are free to use without consent, when used in conjunction with
- a Red Eclipse article, comment, review, advertisement, or redistribution of
- the game; regardless of the media featured in said material. Use for any other
- reason is strictly prohibited without express written consent of Red Eclipse.
- .
- In this case the resulting binary packages and the contents of debian/* are to
- be considered separate instances of "the game" and are redistributable along
- with the "Red Eclipse" name under the following terms:
- .
- Limited rights are granted to redistribute and/or recompress the entire
- distribution using different archival/binary formats suitable for your OS
- (zip/tgz/deb/dmg), any changes beyond that require explicit permission from the
- developers.
- .
- If the "Red Eclipse" name is removed, the contents of debian/* falls completely
- under the MIT Expat license.
+License: Zlib
 
 License: Zlib
  This software is provided 'as-is', without any express or implied

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