r2468 - non-free/packages/trunk/oolite-data/debian

Eddy Petrisor eddyp-guest at alioth.debian.org
Tue Mar 6 23:37:08 CET 2007 

Author: eddyp-guest
Date: 2007-03-06 22:37:08 +0000 (Tue, 06 Mar 2007)
New Revision: 2468

Removed:
   non-free/packages/trunk/oolite-data/debian/svn-deblayout
Modified:
   non-free/packages/trunk/oolite-data/debian/
   non-free/packages/trunk/oolite-data/debian/changelog
   non-free/packages/trunk/oolite-data/debian/control
   non-free/packages/trunk/oolite-data/debian/copyright
Log:
+  * remove debian/svn-deblayout from the source since it holds 0 value for the
+    actual source package (use properties instead)
+  * the game was relicensed by upstream with the dual license model (GNU GPL
+    and CC-NC-SA) - this was acknowledged to be done also retroactively for
+    the current stable release of the game. Here is a quote from upstream's
+    announce on its forum:
+    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.
+  * change section from non-free/games to games as a consequence of the former
+  * Small changes to the description for the Homepage semi-field
+    (now matches the description format in the game package)



Property changes on: non-free/packages/trunk/oolite-data/debian
___________________________________________________________________
Name: svn-bp:origDir
   + ..
Name: svn-bp:trunkDir
   + .
Name: svn-bp:trunkUrl
   + svn+ssh://svn.debian.org/svn/pkg-games/non-free/packages/trunk/oolite-data
Name: svn-bp:buildArea
   + ../build-area

Modified: non-free/packages/trunk/oolite-data/debian/changelog
===================================================================
--- non-free/packages/trunk/oolite-data/debian/changelog	2007-03-06 22:32:13 UTC (rev 2467)
+++ non-free/packages/trunk/oolite-data/debian/changelog	2007-03-06 22:37:08 UTC (rev 2468)
@@ -1,6 +1,19 @@
 oolite-data (1.65-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * remove debian/svn-deblayout from the source since it holds 0 value for the
+    actual source package
+  * the game was relicensed by upstream with the dual license model (GNU GPL
+    and CC-NC-SA) - this was acknowledged to be done also retroactively for
+    the current stable release of the game. Here is a quote from upstream's
+    announce on its forum:
+    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.
+  * change section from non-free/games to games as a consequence of the former
+  * Small changes to the description for the Homepage semi-field
+    (now matches the description format in the game package)
 
  -- Eddy Petrișor <eddy.petrisor at gmail.com>  Thu, 27 Jul 2006 00:43:01 +0300
 

Modified: non-free/packages/trunk/oolite-data/debian/control
===================================================================
--- non-free/packages/trunk/oolite-data/debian/control	2007-03-06 22:32:13 UTC (rev 2467)
+++ non-free/packages/trunk/oolite-data/debian/control	2007-03-06 22:37:08 UTC (rev 2468)
@@ -1,5 +1,5 @@
 Source: oolite-data
-Section: non-free/games
+Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Eddy Petrișor <eddy.petrisor at gmail.com>
@@ -18,5 +18,6 @@
  .
  This package contains the data files needed for the Oolite game.
  .
- Linux port homepage: http://oolite-linux.berlios.de/
- Original game homepage: http://oolite.aegidian.org/
+  Original game homepage: http://oolite.aegidian.org/
+ .
+  Homepage: http://oolite-linux.berlios.de/

Modified: non-free/packages/trunk/oolite-data/debian/copyright
===================================================================
--- non-free/packages/trunk/oolite-data/debian/copyright	2007-03-06 22:32:13 UTC (rev 2467)
+++ non-free/packages/trunk/oolite-data/debian/copyright	2007-03-06 22:37:08 UTC (rev 2468)
@@ -3,8 +3,72 @@
 
 It was downloaded from http://oolite-linux.berlios.de/
 
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+NOTE: This game has been retroactively relicensed with a
+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:
+[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

Deleted: non-free/packages/trunk/oolite-data/debian/svn-deblayout
===================================================================
--- non-free/packages/trunk/oolite-data/debian/svn-deblayout	2007-03-06 22:32:13 UTC (rev 2467)
+++ non-free/packages/trunk/oolite-data/debian/svn-deblayout	2007-03-06 22:37:08 UTC (rev 2468)
@@ -1,4 +0,0 @@
-buildArea=../build-area
-origDir=..
-trunkDir=.
-trunkUrl=svn+ssh://svn.debian.org/svn/pkg-games/non-free/packages/trunk/oolite-data

More information about the Pkg-games-commits mailing list