From fc0e479d562a7853bed3d064345c2c68cf83e275 Mon Sep 17 00:00:00 2001 From: Tom Reynolds Date: Tue, 14 Jan 2014 16:32:38 +0100 Subject: [PATCH] * Move masterserver docs to docs/ subdirectory * Update copyright period to 2014 * Remove Debian specific license hints since: that isn't necessary in any file except the Debian copyright file --- data/glest_game | 2 +- docs/COPYRIGHT.source_code.txt | 18 +++++----- docs/README.txt | 24 +++++--------- docs/gnu_gpl_3.0.txt | 7 ---- source/masterserver/README.txt | 1 + source/masterserver/docs/AUTHORS.txt | 33 +++++++++++++++++++ .../masterserver/{README => docs/README.txt} | 0 .../{LICENSE => docs/gnu_gpl_3.0.txt} | 7 ---- 8 files changed, 54 insertions(+), 38 deletions(-) create mode 100644 source/masterserver/README.txt create mode 100644 source/masterserver/docs/AUTHORS.txt rename source/masterserver/{README => docs/README.txt} (100%) rename source/masterserver/{LICENSE => docs/gnu_gpl_3.0.txt} (99%) diff --git a/data/glest_game b/data/glest_game index 30b3eb10..4338c735 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 30b3eb105b08137b2388287a97fa65c39fe3746b +Subproject commit 4338c735393e942cefd983b5bdffd92adf6a542d diff --git a/docs/COPYRIGHT.source_code.txt b/docs/COPYRIGHT.source_code.txt index 193578f1..db125253 100644 --- a/docs/COPYRIGHT.source_code.txt +++ b/docs/COPYRIGHT.source_code.txt @@ -3,14 +3,22 @@ MegaGlest Source Code License You can redistribute this code and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. -The complete License is contained in this distribution in the file + +The complete license is contained in this distribution in the file 'gnu_gpl_3.0.txt' and also available online at http://www.gnu.org/licenses/gpl.html +On Debian GNU/Linux systems (and derivates) please find license information in: +/usr/share/common-licenses/GPL +/usr/share/common-licenses/GPL-2 +/usr/share/common-licenses/GPL-2+ +/usr/share/common-licenses/GPL-3 +/usr/share/common-licenses/GPL-3+ + Except where otherwise noted, all of the documentation, multimedia and software included in the MegaGlest setup package is copyrighted by The MegaGlest Team. -Copyright (C) 2001-2012 The MegaGlest Team. All rights reserved. +Copyright (C) 2001-2014 The MegaGlest Team. All rights reserved. This software is provided without any express or implied warranty. In no event shall the author be held liable for any damages arising from the use of this @@ -20,12 +28,6 @@ This software may be redistributed freely, but all redistributions must retain all occurences of the above copyright notice and web site addresses that are currently in place and must provide full source code with ALL modifications. -On debian systems please find license information in: -/usr/share/common-licenses/GPL -/usr/share/common-licenses/GPL-2 -/usr/share/common-licenses/GPL-2+ -/usr/share/common-licenses/GPL-3 -/usr/share/common-licenses/GPL-3+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MegaGlest is a fork of Glest, so Glests' license terms also apply to MegaGlest. diff --git a/docs/README.txt b/docs/README.txt index 90470774..3038c189 100644 --- a/docs/README.txt +++ b/docs/README.txt @@ -26,8 +26,8 @@ Hardware requirements: * >= 6th generation x86 CPU with 1.5 GHz or better (modern CPU series with at least two cores of at least 1.5 Ghz recommended) -* 1.0 GB RAM - (2.0 GB recommended) +* 1.5 GB RAM + (2.0 GB RAM recommended) * Graphics chip supporting OpenGL 1.3 with GL_ARB_env_crossbar and shader extensions (=OpenGL 1.4 or glUseProgramObjectARB etc.) or higher (dedicated video card with hardware 3D acceleration recommended) @@ -115,7 +115,7 @@ MegaGlest can be configured in two ways: - manual editing of glestuser.ini (options) and glestuserkeys.ini (hotkeys) DO NOT directly edit glest.ini and glestkeys.ini but rather edit glestuser.ini -and glestuserkeys.ini and create your user over-ride values in these files. +and glestuserkeys.ini overwriting global defaults. On Linux, these files are located in ~/.megaglest/ (note the leading dot, this is a hidden directory). @@ -237,13 +237,15 @@ same mods. megaglest => start game normally megaglest --version => display the version string -megaglest --server => start in the custom game screen - with all slots open +megaglest --starthost => start in the custom game screen + with open network slots megaglest --headless-server-mode => start a headless server, the first connecting user will manage it -megaglest --client ServerIp => start game connecting to a server +megaglest --connect IPADDR[:PORT] => start game connecting to the server + at the given IPv4 address -For a complete list, run: megaglest --help +For a complete list, run: +megaglest --help ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -277,11 +279,3 @@ their own by reading up on available documentation before getting in touch. Network: irc.freenode.net Channel: #megaglest Or use the webchat at http://chat.megaglest.org/ - -On Debian GNU/Linux systems please find license information in: -/usr/share/common-licenses/GPL -/usr/share/common-licenses/GPL-2 -/usr/share/common-licenses/GPL-2+ -/usr/share/common-licenses/GPL-3 -/usr/share/common-licenses/GPL-3+ - diff --git a/docs/gnu_gpl_3.0.txt b/docs/gnu_gpl_3.0.txt index 7325c037..94a9ed02 100644 --- a/docs/gnu_gpl_3.0.txt +++ b/docs/gnu_gpl_3.0.txt @@ -5,13 +5,6 @@ Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -On debian systems please find license information in: -/usr/share/common-licenses/GPL -/usr/share/common-licenses/GPL-2 -/usr/share/common-licenses/GPL-2+ -/usr/share/common-licenses/GPL-3 -/usr/share/common-licenses/GPL-3+ - Preamble The GNU General Public License is a free, copyleft license for diff --git a/source/masterserver/README.txt b/source/masterserver/README.txt new file mode 100644 index 00000000..ffb16c82 --- /dev/null +++ b/source/masterserver/README.txt @@ -0,0 +1 @@ +Please refer to the files in the docs/ subdirectory. diff --git a/source/masterserver/docs/AUTHORS.txt b/source/masterserver/docs/AUTHORS.txt new file mode 100644 index 00000000..73d1775a --- /dev/null +++ b/source/masterserver/docs/AUTHORS.txt @@ -0,0 +1,33 @@ +* Copyrights * + +Except where otherwise noted, all of the documentation, multimedia and software +included in the MegaGlest setup package is copyrighted by The MegaGlest Team. + +Copyright (C) 2001-2014 The MegaGlest Team. All rights reserved. + +This software is provided without any express or implied warranty. In no event +shall the author be held liable for any damages arising from the use of this +software. + +This software may be redistributed freely, but all redistributions must retain +all occurences of the above copyright notice and web site addresses that are +currently in place and must provide full source code with ALL modifications. + + + +* Licensing * + +You can redistribute this code and/or modify it under the terms of the GNU +General Public License as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later version. + +The complete license is contained in this distribution in the file +'gnu_gpl_3.0.txt' and also available online at +http://www.gnu.org/licenses/gpl.html + +On Debian GNU/Linux systems (and derivates) please find license information in: +/usr/share/common-licenses/GPL +/usr/share/common-licenses/GPL-2 +/usr/share/common-licenses/GPL-2+ +/usr/share/common-licenses/GPL-3 +/usr/share/common-licenses/GPL-3+ diff --git a/source/masterserver/README b/source/masterserver/docs/README.txt similarity index 100% rename from source/masterserver/README rename to source/masterserver/docs/README.txt diff --git a/source/masterserver/LICENSE b/source/masterserver/docs/gnu_gpl_3.0.txt similarity index 99% rename from source/masterserver/LICENSE rename to source/masterserver/docs/gnu_gpl_3.0.txt index 7325c037..94a9ed02 100644 --- a/source/masterserver/LICENSE +++ b/source/masterserver/docs/gnu_gpl_3.0.txt @@ -5,13 +5,6 @@ Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -On debian systems please find license information in: -/usr/share/common-licenses/GPL -/usr/share/common-licenses/GPL-2 -/usr/share/common-licenses/GPL-2+ -/usr/share/common-licenses/GPL-3 -/usr/share/common-licenses/GPL-3+ - Preamble The GNU General Public License is a free, copyleft license for