r2466 - non-free/packages/trunk/oolite/debian

[Eddy Petrisor]

Author: eddyp-guest
Date: 2007-03-06 22:01:01 +0000 (Tue, 06 Mar 2007)
New Revision: 2466

Modified:
   non-free/packages/trunk/oolite/debian/changelog
   non-free/packages/trunk/oolite/debian/copyright
Log:
more work on the copyright file

Modified: non-free/packages/trunk/oolite/debian/changelog
===================================================================
--- non-free/packages/trunk/oolite/debian/changelog	2007-03-06 19:29:18 UTC (rev 2465)
+++ non-free/packages/trunk/oolite/debian/changelog	2007-03-06 22:01:01 UTC (rev 2466)
@@ -12,7 +12,7 @@
     Commons Attribution-NonCommercial-ShareAlike 2.0 license, herafter known
     as CC-by-nc-sa-2) or the GPL.
 
- -- Eddy Petrișor <eddy.petrisor at gmail.com>  Tue,  6 Mar 2007 18:51:09 +0200
+ -- Eddy Petrișor <eddy.petrisor at gmail.com>  Wed,  7 Mar 2007 00:00:13 +0200
 
 oolite (1.65-4) unstable; urgency=low
 

Modified: non-free/packages/trunk/oolite/debian/copyright
===================================================================
--- non-free/packages/trunk/oolite/debian/copyright	2007-03-06 19:29:18 UTC (rev 2465)
+++ non-free/packages/trunk/oolite/debian/copyright	2007-03-06 22:01:01 UTC (rev 2466)
@@ -3,31 +3,72 @@
 
 It was downloaded from http://oolite-linux.berlios.de/
 
-==================================================
-This package is autobuildable.
---------------------------------------------------
-The package oolite (and oolite-data) are distributed
-under the Creative Commons
-Attribution-NonCommercial-ShareAlike 2.0.
-
-The only problem with this license is the fact that
-is non-commercial and thus is fit to be autobuilt.
-There are no restrictions related to architecture,
-distribution, other than the non-commercial clause.
-==================================================
-
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 NOTE: This game has been retroactively relicensed with a
-dual license model: GPL and CC-NC-SA.
+dual license model: GPL and CC-NC-SA (so,starting
+from 1.65, the game can be distributed as free software;
+later versions will be GPL only).
 
+
+--------------------
+Original announcement on the upstream forum[1]:
+
+Barring unanticipated objections from contributors we’ve forgotten, future versions of Oolite will be distributed under the GNU General Public License version 2, from here on referred to as the GPL. Resources – models, textures, sounds, images – will be distrubuted under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 license (herafter known as CC-by-nc-sa-3).
+(If you’re a contributor we’ve forgotten, and have an unanticipated objection, please make it known as soon as possible.)
+
+What this means:
+
+    * All previous versions of Oolite may still be distributed (in source and object form) under the same licenses as before.
+    * The current official release, 1.65, may be considered to be dual-licensed; that is, it may be distributed under its current license (the Creative Commons Attribution-NonCommercial-ShareAlike 2.0 license, herafter known as CC-by-nc-sa-2) or the GPL.
+    * Existing derivative works which conformed to the license – that is, works using parts of Oolite’s source code or original resources, and distributed under CC-by-nc-sa-2 (or the previous modified BSD license, for older derivative wors) – are not affected; they may continue to be distributed under their current license in perpetuity.
+    * However, authors of such works may choose to distribute their works under the GPL instead.
+    * New derivative works based on Oolite 1.65 or earlier may be distributed under either CC-by-nc-sa-2 or the GPL.
+    * New derivative works based on versions of Oolite released after today (27 February 2007) may be distributed under the GPL or CC-by-nc-sa-3, excepting derivative works which contain Oolite source code, which may only be distributed under the GPL.
+
+This decision was taken by agreement between Giles Williams, Dylan Smith, David Taylor and myself, Jens Ayton, through an agonizing process of forgetting about it for months at a time.
+
+--------------------
+Quotes from the upstream forum[2]:
+--------------------
+Ahruman wrote:
+eddyp wrote:
+> So to make it clear:
+>
+>    Oolite (the engine) is GPL 2.0 or later
+>      (at choice)/CC-NC-SA (2.0 for releases until
+>      now, 3.0 from now on)
+>    Oolite-data is CC-NC-SA (2.0 for releases until
+>      now, 3.0 from now on)
+>
+>
+> Is this correct?
+
+No.
+From now on, Oolite (the application) is GPL 2 or
+later only. The data is GPL 2 or later, or CC-by-nc-sa 3.0.
+--------------------
+Ahruman wrote:
+eddyp wrote:
+> Is the thing about data true for 1.65 ? If so, I will
+> have to make a fast upload in Debian so is part of the
+> new Debian release which is really soon to come.
+
+The dual-licensing applies retroactively to 1.65 (but not earlier).
+1.65 may also be distributed under CC-by-nc-sa 2.0.
+However, there is currently no distribution of 1.65 with
+license files that reflect this.
+--------------------
+
+
 More info (for now) at:
-http://www.aegidian.org/bb/viewtopic.php?t=3072
-http://www.aegidian.org/bb/viewtopic.php?p=32115
+[1] http://www.aegidian.org/bb/viewtopic.php?t=3072
+[2] http://www.aegidian.org/bb/viewtopic.php?p=32115
 http://oolite.aegidian.org/
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 Copyright Holder: Giles Williams and the Oolite project.
 
+License: GNU GPL v2 or later, see /usr/share/common-licenses/GPL
 License: http://creativecommons.org/licenses/by-nc-sa/2.0/
 
 Creative Commons Legal Code