From 7fde0e892878870c38fc2d443021d4b8e2980e0e Mon Sep 17 00:00:00 2001 From: kbulgrien Date: Sat, 12 Jan 2008 04:59:22 +0000 Subject: [PATCH] Remove misc/machine.arc and machine.base.x11.png and newly added LICENCE (as it was added specifically to address Creative Commons licensing) due to concerns about Creative Commons ShareAlike licensing requirements, and most especially concerning a possible perception that this project or a distribution might be construed to be a "collection" as defined by Creative Commons. git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@8171 282e977c-c81d-0410-88c4-b93c2d0d6712 --- CHANGES | 7 +++ LICENSE | 35 ------------ misc/machine.arc | 117 -------------------------------------- misc/machine.base.x11.png | Bin 7323 -> 0 bytes 4 files changed, 7 insertions(+), 152 deletions(-) delete mode 100644 LICENSE delete mode 100644 misc/machine.arc delete mode 100644 misc/machine.base.x11.png diff --git a/CHANGES b/CHANGES index c3edcf02c..34c16bb75 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,12 @@ Changes for SVN top of tree: +Remove misc/machine.arc and machine.base.x11.png and newly added LICENCE (as it +was added specifically to address Creative Commons licensing) due to concerns +about Creative Commons ShareAlike licensing requirements, and most especially +concerning a possible perception that this project or a distribution might be +construed to be a "collection" as defined by Creative Commons. +Kevin Bulgrien 2007-01-11 + Correct the license text to show that this derivation is released under version 3.0 Creative Commons licensing to improve compatibility with Debian. diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 3733bc9e7..000000000 --- a/LICENSE +++ /dev/null @@ -1,35 +0,0 @@ -=============================================================================== -LICENSE -=============================================================================== - -All of the graphics in the arch collection are not necessarily controlled under -identical licenses. Use this file to identify the types of licenses used for -these works. Note however, that this file does not necessarily list all -licenses in use. - -It is suggested that the license terms for a graphic file be placed in comment -sections of .arc files that reference them. See misc/machine.arc for an -example. - -CREATIVE COMMONS ----------------- - -Creative Commons "Some Rights Reserved" - -Various Creative Commons Licenses exist. The following are known to be -used for certain works in the arch collection: - -* Attribution-ShareAlike - - Some of the graphics and/or .arc files in this collection are licensed under - the terms of an Attribution-ShareAlike. Such works are redistributions, or - derivatives, of similarly licensed material. - - Original works are usually copyrighted. Credit, or attribution, must be - given to the copyright holder and/or author according to terms he/she - provides. The original work is licensed under an Attribution-ShareAlike - Creative Commons License, and derivative works must be licensed under the - same terms as the original work. The terms of this license are described - at http://creativecommons.org/licenses/by-sa/3.0/, and includes important - disclaimers of warranty and liability. - diff --git a/misc/machine.arc b/misc/machine.arc deleted file mode 100644 index 8ac63718d..000000000 --- a/misc/machine.arc +++ /dev/null @@ -1,117 +0,0 @@ -# The machine.base.x111.png artwork is a derivative work of an image published -# at: -# -# http://www.marcdatabase.com/ -# ~lemur/lemur.com/gallery-of-antiquarian-technology/ -# steam-engines/hf-steam-models/hf-table-engine-2-1200x1600.jpg -# -# Creative Commons "Some Rights Reserved" -# -# The original image is Copyright © 2001, 2004 by David M. MacMillan and -# Rollande Krandall. The original work, and this derivative, are both licensed -# under a Creative Commons Attribution-ShareAlike License which is described -# at http://creativecommons.org/licenses/by-sa/2.0/. The license includes -# important disclaimers of warranty and liability. -# -# The derivative work is distributed under the Attribution-ShareAlike -# license described at at http://creativecommons.org/licenses/by-sa/3.0/. -# Attribution requirements are met through retention of this header text. -# -Object Machine.1 -name Machine -title of the Empire -face machine.x11 -move_block none -blocksview 0 -identified 1 -no_pick 1 -x 0 -y 0 -end -More -Object Machine.2 -face machine.x11 -move_block all -x 1 -y 0 -end -More -Object Machine.3 -face machine.x11 -move_block none -blocksview 0 -x 2 -y 0 -end -More -Object Machine.4 -face machine.x11 -move_block all -blocksview 0 -x 0 -y 1 -end -More -Object Machine.5 -face machine.x11 -move_block all -blocksview 1 -x 1 -y 1 -end -More -Object Machine.6 -face machine.x11 -move_block all -blocksview 1 -x 2 -y 1 -end -More -Object Machine.7 -face machine.x11 -move_block all -blocksview 1 -x 0 -y 2 -end -More -Object Machine.8 -face machine.x11 -move_block all -blocksview 0 -x 1 -y 2 -end -More -Object Machine.9 -face machine.x11 -move_block all -blocksview 1 -x 2 -y 2 -end -More -Object Machine.A -face machine.x11 -move_block none -blocksview 0 -x 0 -y 3 -end -More -Object Machine.B -face machine.x11 -move_block all -blocksview 0 -x 1 -y 3 -end -More -Object Machine.C -face machine.x11 -move_block none -blocksview 0 -x 2 -y 3 -end diff --git a/misc/machine.base.x11.png b/misc/machine.base.x11.png deleted file mode 100644 index 329448708a4e50794a9d01c4ec4d93bd721173cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7323 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 By@UV&