r12355 - non-free/packages/trunk/assaultcube-data/debian
Arand Nash
arand-guest at alioth.debian.org
Sat May 14 20:26:40 UTC 2011
Author: arand-guest
Date: 2011-05-14 20:26:33 +0000 (Sat, 14 May 2011)
New Revision: 12355
Modified:
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server.6
non-free/packages/trunk/assaultcube-data/debian/assaultcube.6
non-free/packages/trunk/assaultcube-data/debian/copyright
Log:
CC-BY-NC-SA, manpage & copyright tweaks
* Since materal used in manpages are in fact CC-BY-NC-SA, change that.
* "Files:" headers pointing at directory instead of license file.
* Corrections in the manual page
Modified: non-free/packages/trunk/assaultcube-data/debian/assaultcube-server.6
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/assaultcube-server.6 2011-05-14 20:13:25 UTC (rev 12354)
+++ non-free/packages/trunk/assaultcube-data/debian/assaultcube-server.6 2011-05-14 20:26:33 UTC (rev 12355)
@@ -1,16 +1,29 @@
.ig
-This manual page is Copyright (C) 2011 Arand Nash <ienorand at gmail.com>
-It is relesed under the CC-BY-NC 3.0 Unported License.
-
-The majority of the informational content in this manual page is taken from
-<http://assault.cubers.net/docs/commandline.html>
-Which is Copyright (C) Rabid Viper Productions.
-Released under the CC-BY-NC 3.0 Unported License.
-
- This work is licensed under the Creative Commons Attribution-NonCommercial 3.0
- Unported License. To view a copy of this license, visit
- http://creativecommons.org/licenses/by-nc/3.0/ or send a letter to Creative
- Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
+Copyright: Copyright (C) Rabid Viper
+ Copyright (C) 2011 Arand Nash <ienorand at gmail.com>
+License: CC-BY-NC-SA
+ This manual page is Copyright (C) 2011 Arand Nash <ienorand at gmail.com>
+ It is relesed under the CC-BY-NC-SA 3.0 Unported License with an additional
+ clause as follows:
+ Origin - You must not use the work(s) to misrepresent the origin of
+ AssaultCube, or claim that you created AssaultCube or any of the original
+ AssaultCube package(s).
+ .
+ The majority of the informational content in this manual page is taken from
+ <http://assault.cubers.net/docs/commandline.html>
+ Which is Copyright (C) Rabid Viper Productions.
+ Released under the CC-BY-NC-SA 3.0 Unported License with an additional
+ clause as follows:
+ Origin - You must not use the work(s) to misrepresent the origin of
+ AssaultCube, or claim that you created AssaultCube or any of the original
+ AssaultCube package(s).
+ .
+ CC-BY-NC-SA:
+ This work is licensed under the Creative Commons
+ Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a copy of
+ this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/ or send
+ a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View,
+ California, 94041, USA.
..
.TH ASSAULTCUBE 6 "May 7, 2011"
.SH NAME
@@ -200,6 +213,13 @@
;
LBLLW52.
T{
+.
+T} T{
+.B Default
+T} T{
+.B Description
+T}
+T{
f
T} T{
Lower
@@ -411,7 +431,7 @@
.BI \-y N
Sets the ban threshold to N. If a players score drops below it, he will be banned automatically. The default is -6, all negative values DO require a minus sign.
.TP
-.BI \-k AN
+.BI \-kA N
Sets the threshold (in seconds) for the "AFK" auto-kick to N. The server won't auto-kick if:
.IP
* The servers mastermode is PRIVATE or MATCH.
@@ -420,7 +440,7 @@
.IP
The server will assume inactive players, even if chatting or in spectate mode, as AFK. If the value is set lower than 30 seconds, then AFK auto-kick is disabled. The default setting is 45 seconds.
.TP
-.BI \-k BN
+.BI \-kB N
Sets the amount of minutes a banned player will remain banned from the server to N
The default is 20 minutes.
.TP
Modified: non-free/packages/trunk/assaultcube-data/debian/assaultcube.6
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/assaultcube.6 2011-05-14 20:13:25 UTC (rev 12354)
+++ non-free/packages/trunk/assaultcube-data/debian/assaultcube.6 2011-05-14 20:26:33 UTC (rev 12355)
@@ -1,16 +1,29 @@
.ig
-This manual page is Copyright (C) 2011 Arand Nash <ienorand at gmail.com>
-It is relesed under the CC-BY-NC 3.0 Unported License.
-
-The majority of the informational content in this manual page is taken from
-<http://assault.cubers.net/docs/commandline.html>
-Which is Copyright (C) Rabid Viper Productions.
-Released under the CC-BY-NC 3.0 Unported License.
-
- This work is licensed under the Creative Commons Attribution-NonCommercial 3.0
- Unported License. To view a copy of this license, visit
- http://creativecommons.org/licenses/by-nc/3.0/ or send a letter to Creative
- Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
+Copyright: Copyright (C) Rabid Viper
+ Copyright (C) 2011 Arand Nash <ienorand at gmail.com>
+License: CC-BY-NC-SA
+ This manual page is Copyright (C) 2011 Arand Nash <ienorand at gmail.com>
+ It is relesed under the CC-BY-NC-SA 3.0 Unported License with an additional
+ clause as follows:
+ Origin - You must not use the work(s) to misrepresent the origin of
+ AssaultCube, or claim that you created AssaultCube or any of the original
+ AssaultCube package(s).
+ .
+ The majority of the informational content in this manual page is taken from
+ <http://assault.cubers.net/docs/commandline.html>
+ Which is Copyright (C) Rabid Viper Productions.
+ Released under the CC-BY-NC-SA 3.0 Unported License with an additional
+ clause as follows:
+ Origin - You must not use the work(s) to misrepresent the origin of
+ AssaultCube, or claim that you created AssaultCube or any of the original
+ AssaultCube package(s).
+ .
+ CC-BY-NC-SA:
+ This work is licensed under the Creative Commons
+ Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a copy of
+ this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/ or send
+ a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View,
+ California, 94041, USA.
..
.TH ASSAULTCUBE 6 "May 7, 2011"
.SH NAME
Modified: non-free/packages/trunk/assaultcube-data/debian/copyright
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/copyright 2011-05-14 20:13:25 UTC (rev 12354)
+++ non-free/packages/trunk/assaultcube-data/debian/copyright 2011-05-14 20:26:33 UTC (rev 12355)
@@ -255,7 +255,7 @@
-----//-----
-Files: packages/models/weapons/license.txt
+Files: packages/models/weapons/* packages/models/misc/*
License:
Description
===========
@@ -307,60 +307,8 @@
-----//-----
-Files: packages/models/misc/license.txt
+Files: packages/models/mapmodels/cleaner/*
License:
-Description
-===========
-Files in this folder:
-
-by "makkE"
-Markus Bekel
-e-mail: makk_e at web.de
-
-===================================================================================================
-These files have been licensed under a the
-"Creative Commons Deed / Attribution Non-commercial Share-Alike ( at-nc-sa )"
-===================================================================================================
-
-You are free:
-
- * to copy, distribute, display, and perform the work
- * to make derivative works
-
-Under the following conditions:
-
-"by"
- -Attribution. You must give the original author credit.
-"nc"
- -Non-Commercial. You may not use this work for commercial purposes.
-"sa"
- -Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting work only under a licence identical to this one.
-
- * For any reuse or distribution, you must make clear to others the licence terms of this work.
- * Any of these conditions can be waived if you get permission from the copyright holder.
-
-Your fair use and other rights are in no way affected by the above.
-
-This is a human-readable summary of the Legal Code (the full licence).
-
-=====================================================================================================
-
-See:
-
-http://creativecommons.org/licenses/by-nc-sa/2.5/deed.en_GB
-
-for the original "human readable" document.
-
-http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode
-
-for the full legal code.
-
-visit creativecommons.org for general information and translations of the above documents.
-
- -----//-----
-
-Files: packages/models/mapmodels/cleaner/license.txt
-License:
2010-05-18
==========
All mapmodels in sub-folders:
@@ -382,7 +330,7 @@
-----//-----
-Files: packages/models/mapmodels/toca/license.txt
+Files: packages/models/mapmodels/toca/*
License:
Toca's 3D Models for AssaultCube
@@ -484,7 +432,7 @@
-----//-----
-Files: packages/models/mapmodels/licenses.txt
+Files: packages/models/mapmodels/*
License:
AssaultCube Mapmodels
__________________________________________________________________________________________________
@@ -586,7 +534,7 @@
-----//-----
-Files: packages/models/mapmodels/misterfloppy/license.txt
+Files: packages/models/mapmodels/misterfloppy/*
License:
LICENSE
=======
@@ -622,7 +570,7 @@
-----//-----
-Files: packages/models/mapmodels/rattrap/license.txt
+Files: packages/models/mapmodels/rattrap/*
License:
=========================
Modelled/Skinned by JCDPC
@@ -657,7 +605,7 @@
-----//-----
-Files: packages/models/mapmodels/rattrap/milkcrate2/license.txt
+Files: packages/models/mapmodels/rattrap/milkcrate2/*
License:
This model is originally by Toca.
@@ -714,7 +662,7 @@
-----//-----
-Files: packages/models/mapmodels/rattrap/milkcrate1/license.txt
+Files: packages/models/mapmodels/rattrap/milkcrate1/*
License:
This model is originally by Toca.
@@ -771,7 +719,7 @@
-----//-----
-Files: packages/models/pickups/license.txt
+Files: packages/models/pickups/*
License:
Description
===========
@@ -823,7 +771,7 @@
-----//-----
-Files: packages/textures/drunkenM/license.txt
+Files: packages/textures/drunkenM/*
License:
This texture was lifted from flickr by drunkenM and then modified. It had the below license assigned to it:
@@ -831,7 +779,7 @@
-----//-----
-Files: packages/textures/skymaps/socksky/license.txt
+Files: packages/textures/skymaps/socksky/*
License:
These skymaps are by SimonOC, which can be found here:
@@ -848,7 +796,7 @@
-----//-----
-Files: packages/textures/skymaps/ladynighthawk/license.txt
+Files: packages/textures/skymaps/ladynighthawk/*
License:
Credit for this skymap (inhcanyons1) goes to Lady NightHawk of http://www.alusion-fr.com/an1ffa3.htm
@@ -879,7 +827,7 @@
-----//-----
-Files: packages/textures/jamz/license.txt
+Files: packages/textures/jamz/*
License:
2010-05-18
==========
@@ -890,7 +838,7 @@
-----//-----
-Files: packages/textures/openfootage/license.txt
+Files: packages/textures/openfootage/*
License:
All files in this folder are licensed under the CC license. All images have been edited to fit the AC engine correctly.
@@ -906,7 +854,7 @@
-----//-----
-Files: packages/textures/rattrap/license.txt
+Files: packages/textures/rattrap/*
License:
* rb_box_01.jpg
* rb_box_02.jpg
@@ -961,7 +909,7 @@
-----//-----
-Files: packages/textures/johnsolo/license.txt
+Files: packages/textures/johnsolo/*
License:
All files in this folder are from: http://www.johnsolo.net/tex/tex.php
@@ -974,7 +922,7 @@
-----//-----
-Files: packages/audio/songs/licenses.txt
+Files: packages/audio/songs/*
License:
╔═══════════════════════════════════════════════╗
║ ac.ogg ║
@@ -1005,3 +953,32 @@
║ may apply to the license because of this. ║
╚═══════════════════════════════════════════════╝
+ -----//-----
+
+Files: debian/assaultcube-server.6 debian/assaultcube.6
+Copyright: Copyright (C) Rabid Viper
+ Copyright (C) 2011 Arand Nash <ienorand at gmail.com>
+License: CC-BY-NC-SA
+ This manual page is Copyright (C) 2011 Arand Nash <ienorand at gmail.com>
+ It is relesed under the CC-BY-NC-SA 3.0 Unported License with an additional
+ clause as follows:
+ Origin - You must not use the work(s) to misrepresent the origin of
+ AssaultCube, or claim that you created AssaultCube or any of the original
+ AssaultCube package(s).
+ .
+ The majority of the informational content in this manual page is taken from
+ <http://assault.cubers.net/docs/commandline.html>
+ Which is Copyright (C) Rabid Viper Productions.
+ Released under the CC-BY-NC-SA 3.0 Unported License with an additional
+ clause as follows:
+ Origin - You must not use the work(s) to misrepresent the origin of
+ AssaultCube, or claim that you created AssaultCube or any of the original
+ AssaultCube package(s).
+ .
+ CC-BY-NC-SA:
+ This work is licensed under the Creative Commons
+ Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a copy of
+ this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/ or send
+ a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View,
+ California, 94041, USA.
+
More information about the Pkg-games-commits
mailing list