r4944 - packages/trunk/conquest/debian/patches
Barry deFreese
bddebian-guest at alioth.debian.org
Fri Dec 14 17:45:50 UTC 2007
Author: bddebian-guest
Date: 2007-12-14 17:45:50 +0000 (Fri, 14 Dec 2007)
New Revision: 4944
Modified:
packages/trunk/conquest/debian/patches/01_man_pages.diff
Log:
Don't escape the - in the Id line in the man pages
Modified: packages/trunk/conquest/debian/patches/01_man_pages.diff
===================================================================
--- packages/trunk/conquest/debian/patches/01_man_pages.diff 2007-12-14 15:46:53 UTC (rev 4943)
+++ packages/trunk/conquest/debian/patches/01_man_pages.diff 2007-12-14 17:45:50 UTC (rev 4944)
@@ -1,11 +1,12 @@
---- conquest-8.3.orig/conqai.man
-+++ conquest-8.3/conqai.man
+diff -urN conquest-8.3/conqai.man conquest-8.3.orig/conqai.man
+--- conquest-8.3/conqai.man 2007-12-14 07:25:48.000000000 -0500
++++ conquest-8.3.orig/conqai.man 2006-09-01 01:45:42.000000000 -0400
@@ -4,7 +4,7 @@
conqai \(em Conquest AI override program
.SH "SYNOPSIS"
.PP
--\fBconqai\fP [\fB-r\fP]
-+\fBconqai\fP [\fB\-r\fP]
+-\fBconqai\fP [\fB\-r\fP]
++\fBconqai\fP [\fB-r\fP]
.SH "DESCRIPTION"
.PP
\fBconqai\fP is a program that allows suitably privileged individuals
@@ -13,8 +14,8 @@
\fBconqai\fP is running.
.PP
.SH "OPTIONS"
--.IP "\fB-r\fP " 10
-+.IP "\fB\-r\fP " 10
+-.IP "\fB\-r\fP " 10
++.IP "\fB-r\fP " 10
Return control of the robots to the Conquest driver. Be sure to do
this after you are finished running conqai to debug the AI, otherwise
the robots won't do anything but sit there.
@@ -22,66 +23,52 @@
others). Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU GPL. Conquest is
.PP
--Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
-+Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
+-Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
++Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
ARTISTIC License.
.PP
Original VAX/VMS Ratfor Conquest:
.PP
--Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
-+Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
+-Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
++Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
use, copy, modify, and distribute this software and its documentation
for any purpose and without fee is hereby granted, provided that this
copyright notice appear in all copies and in all supporting
-only in patch2:
-unchanged:
---- conquest-8.3.orig/conqdriv.man
-+++ conquest-8.3/conqdriv.man
-@@ -1,4 +1,4 @@
--.\" $Id: conqdriv.man 576 2006-08-20 05:51:33Z jon $
-+.\" $Id: conqdriv.man 576 2006\-08\-20 05:51:33Z jon $
- .TH "conqdriv" 6 "" ""
- .SH NAME
- conqdriv \- Drive a Conquest universe.
+diff -urN conquest-8.3/conqdriv.man conquest-8.3.orig/conqdriv.man
+--- conquest-8.3/conqdriv.man 2007-12-14 07:41:18.000000000 -0500
++++ conquest-8.3.orig/conqdriv.man 2006-08-20 01:51:32.000000000 -0400
@@ -47,12 +47,12 @@
conqinitrc and texturesrc files.
.SH "COPYRIGHT"
.PP
--Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
-+Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
+-Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
++Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
ARTISTIC License.
.PP
Original VAX/VMS Ratfor Conquest:
.PP
--Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
-+Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
+-Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
++Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
use, copy, modify, and distribute this software and its documentation
for any purpose and without fee is hereby granted, provided that this
copyright notice appear in all copies and in all supporting
-only in patch2:
-unchanged:
---- conquest-8.3.orig/conqinit.man
-+++ conquest-8.3/conqinit.man
-@@ -1,4 +1,4 @@
--.\" $Id: conquest.man 566 2006-07-30 00:54:31Z jon $
-+.\" $Id: conquest.man 566 2006\-07\-30 00:54:31Z jon $
- .TH "conqinit" 6 "" ""
- .SH NAME
- conqinit \- a utility for the Conquest Init parser (CQI)
+diff -urN conquest-8.3/conqinit.man conquest-8.3.orig/conqinit.man
+--- conquest-8.3/conqinit.man 2007-12-14 07:41:30.000000000 -0500
++++ conquest-8.3.orig/conqinit.man 2007-05-26 22:27:45.000000000 -0400
@@ -9,14 +9,14 @@
.PP
\fBconqinit\fP can be used to test the parser, perform syntax checking
on conqinitrc and texturesrc files, as well as to generate initdata.h
--and sounddata.h header files containing compiled-in defaults.
-+and sounddata.h header files containing compiled\(hyin defaults.
+-and sounddata.h header files containing compiled\(hyin defaults.
++and sounddata.h header files containing compiled-in defaults.
.PP
CQI is a lex/yacc parser that is used by \fBConquest\fP 8.1.2a or
later for configuration of the planets and other general purpose data,
and for the GL client \fBconquestgl\fP, for the specification of
colors, textures, animation definitions, sound, and music.
.PP
--These pre\-generated header files (initdata.h, sounddata.h) contain
-+These pre\(hygenerated header files (initdata.h, sounddata.h) contain
+-These pre\(hygenerated header files (initdata.h, sounddata.h) contain
++These pre\-generated header files (initdata.h, sounddata.h) contain
defaults compiled directly into conquest, in the event the relevant
CQI config file could not be opened or successfully read on startup.
End users should not generate these files. Validated header files are
@@ -89,27 +76,20 @@
by \fBconqinit\fP, as well as other information not mentioned here.
.SH "COPYRIGHT"
.PP
--Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
-+Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
+-Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
++Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
ARTISTIC License.
-only in patch2:
-unchanged:
---- conquest-8.3.orig/conqmetad.man
-+++ conquest-8.3/conqmetad.man
-@@ -1,4 +1,4 @@
--.\" $Id: conqmetad.man 576 2006-08-20 05:51:33Z jon $
-+.\" $Id: conqmetad.man 576 2006\-08\-20 05:51:33Z jon $
- .TH "conqmetad" 6 "" ""
- .SH NAME
- conqmetad \- a Conquest Meta server
+diff -urN conquest-8.3/conqmetad.man conquest-8.3.orig/conqmetad.man
+--- conquest-8.3/conqmetad.man 2007-12-14 07:41:45.000000000 -0500
++++ conquest-8.3.orig/conqmetad.man 2006-08-20 01:51:32.000000000 -0400
@@ -13,7 +13,7 @@
\fB\-m\fP option. This makes it easy for people to find prospective
games.
.PP
--The de-facto Conquest Meta server runs at \fBconquest.radscan.com\fP.
-+The de\(hyfacto Conquest Meta server runs at \fBconquest.radscan.com\fP.
+-The de\(hyfacto Conquest Meta server runs at \fBconquest.radscan.com\fP.
++The de-facto Conquest Meta server runs at \fBconquest.radscan.com\fP.
.PP
The meta server listens on port UDP port 1700 for announcements from
\fBconquestd\fP servers. TCP connections to port 1700 cause
@@ -117,33 +97,26 @@
conqinitrc and texturesrc files.
.SH "COPYRIGHT"
.PP
--Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
-+Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
+-Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
++Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
ARTISTIC License.
.PP
Original VAX/VMS Ratfor Conquest:
.PP
--Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
-+Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
+-Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
++Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
use, copy, modify, and distribute this software and its documentation
for any purpose and without fee is hereby granted, provided that this
copyright notice appear in all copies and in all supporting
-only in patch2:
-unchanged:
---- conquest-8.3.orig/conqoper.man
-+++ conquest-8.3/conqoper.man
-@@ -1,4 +1,4 @@
--.\" $Id: conqoper.man 576 2006-08-20 05:51:33Z jon $
-+.\" $Id: conqoper.man 576 2006\-08\-20 05:51:33Z jon $
- .TH "conqoper" 6 "" ""
- .SH NAME
- conqoper \- Conquest Operator (CO) program.
+diff -urN conquest-8.3/conqoper.man conquest-8.3.orig/conqoper.man
+--- conquest-8.3/conqoper.man 2007-12-14 07:41:58.000000000 -0500
++++ conquest-8.3.orig/conqoper.man 2006-08-20 01:51:32.000000000 -0400
@@ -16,7 +16,7 @@
In order to run \fBconqoper\fP, you must be a member of the
\fIconquest\fP group (in /etc/groups), or you must be the root user.
.PP
--\fBconqoper\fP supports a few \fInon\-interactive\fP options listed
-+\fBconqoper\fP supports a few \fInon\(hyinteractive\fP options listed
+-\fBconqoper\fP supports a few \fInon\(hyinteractive\fP options listed
++\fBconqoper\fP supports a few \fInon\-interactive\fP options listed
below. When any of these options are specified, \fBconqoper\fP will
perform the requested action and exit. When no options are specified,
\fBconqoper\fP will run in an interactive mode.
@@ -151,27 +124,26 @@
conqinitrc and texturesrc files.
.SH "COPYRIGHT"
.PP
--Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
-+Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
+-Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
++Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
ARTISTIC License.
.PP
Original VAX/VMS Ratfor Conquest:
.PP
--Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
-+Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
+-Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
++Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
use, copy, modify, and distribute this software and its documentation
for any purpose and without fee is hereby granted, provided that this
copyright notice appear in all copies and in all supporting
-only in patch2:
-unchanged:
---- conquest-8.3.orig/conqstrat.man
-+++ conquest-8.3/conqstrat.man
+diff -urN conquest-8.3/conqstrat.man conquest-8.3.orig/conqstrat.man
+--- conquest-8.3/conqstrat.man 2007-12-14 07:25:48.000000000 -0500
++++ conquest-8.3.orig/conqstrat.man 2006-09-01 01:45:32.000000000 -0400
@@ -3,7 +3,7 @@
conqstrat \(em modify Robot strategy tables
.SH "SYNOPSIS"
.PP
--\fBconqstrat\fP [\fB-v\fP] [\fB-d\fP] [\fB-U\fP] [\fB-o \fIfile\fP\fP]
-+\fBconqstrat\fP [\fB\-v\fP] [\fB\-d\fP] [\fB\-U\fP] [\fB\-o \fIfile\fP\fP]
+-\fBconqstrat\fP [\fB\-v\fP] [\fB\-d\fP] [\fB\-U\fP] [\fB\-o \fIfile\fP\fP]
++\fBconqstrat\fP [\fB-v\fP] [\fB-d\fP] [\fB-U\fP] [\fB-o \fIfile\fP\fP]
.SH "DESCRIPTION"
.PP
This manual page documents briefly the
@@ -179,24 +151,24 @@
the new AI directly, or generate a conqdata.h file that can be compiled into
Conquest and used as the default when the universe is initialized.
.SH "OPTIONS"
--.IP "\fB-v\fP " 10
-+.IP "\fB\-v\fP " 10
+-.IP "\fB\-v\fP " 10
++.IP "\fB-v\fP " 10
Be verbose about everything.
--.IP "\fB-d\fP " 10
-+.IP "\fB\-d\fP " 10
+-.IP "\fB\-d\fP " 10
++.IP "\fB-d\fP " 10
Turn on lots of debugging.
--.IP "\fB-U\fP " 10
-+.IP "\fB\-U\fP " 10
+-.IP "\fB\-U\fP " 10
++.IP "\fB-U\fP " 10
Update the common block directly. This is the most common use for
--non-conquest developers. NOTE: If you then use \fIconqoper\fP to
-+non\(hyconquest developers. NOTE: If you then use \fIconqoper\fP to
+-non\(hyconquest developers. NOTE: If you then use \fIconqoper\fP to
++non-conquest developers. NOTE: If you then use \fIconqoper\fP to
initialize the common block, your AI will be lost and replaced with the
--compiled-in default, so you will need to re\-run this command to
--re\-install your own AI again.
--.IP "\fB-o \fP\fIfile\fP " 10
-+compiled\(hyin default, so you will need to re\(hyrun this command to
-+re\(hyinstall your own AI again.
-+.IP "\fB\-o \fP\fIfile\fP " 10
+-compiled\(hyin default, so you will need to re\(hyrun this command to
+-re\(hyinstall your own AI again.
+-.IP "\fB\-o \fP\fIfile\fP " 10
++compiled-in default, so you will need to re\-run this command to
++re\-install your own AI again.
++.IP "\fB-o \fP\fIfile\fP " 10
Output to \fIfile\fP. Without this
option, output will go to stdout. The normal use of this option is to
generate a header file that is compiled directly into conquest
@@ -204,8 +176,8 @@
AI (with minor fixes) supplied in the original VAX/VMS conquest
distribution. It is also the default AI compiled into Conquest.
\fIconqrule.easy\fP is an AI that is a bit easier on new players :)
--You can install it in an initialized game with \fIconqstrat -U
-+You can install it in an initialized game with \fIconqstrat \-U
+-You can install it in an initialized game with \fIconqstrat \-U
++You can install it in an initialized game with \fIconqstrat -U
<conqrule.easy\fP.
.SH "AUTHOR"
.PP
@@ -213,41 +185,162 @@
others). Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU GPL. Conquest is
.PP
--Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
-+Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
+-Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
++Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
ARTISTIC License.
.PP
Original VAX/VMS Ratfor Conquest:
.PP
--Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
-+Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
+-Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
++Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
use, copy, modify, and distribute this software and its documentation
for any purpose and without fee is hereby granted, provided that this
copyright notice appear in all copies and in all supporting
-only in patch2:
-unchanged:
---- conquest-8.3.orig/conquest.man
-+++ conquest-8.3/conquest.man
-@@ -1,4 +1,4 @@
--.\" $Id: conquest.man 688 2006-11-27 22:34:45Z jon $
-+.\" $Id: conquest.man 688 2006\-11\-27 22:34:45Z jon $
- .TH "conquest" 6 "" ""
- .SH NAME
- conquestgl,conquest \- Conquest game clients
+diff -urN conquest-8.3/conquestd.man conquest-8.3.orig/conquestd.man
+--- conquest-8.3/conquestd.man 2007-12-14 07:42:41.000000000 -0500
++++ conquest-8.3.orig/conquestd.man 2006-08-20 01:51:32.000000000 -0400
+@@ -68,7 +68,7 @@
+
+ In it's simplest (and insecure) form, you can simply run:
+
+- $ conquestd \-d
++ $ conquestd -d
+
+ This will start \fBconquestd\fP, which will fork itself into the background
+ and run as your user id.
+@@ -85,18 +85,18 @@
+ To support internet playes securely, start \fBconquestd\fP as root,
+ and have it run as user 'nobody' by passing the \fB\-u nobody\fP option on
+ the command line. Of course you can create and use some other
+-non\(hyprivileged, non\(hyinteractive user for this task as well.
++non-privileged, non-interactive user for this task as well.
+
+ Something like the following is a good idea:
+
+- # conquestd \-d \-u nobody
++ # conquestd -d -u nobody
+
+ This will have \fBconquestd\fP setuid() permanently to user 'nobody' before
+ beginning operations. On most unix systems, user 'nobody' has no home
+ directory, password, or privileges, and therefore is a safe user id to
+ run under.
+
+-You must be the root user in order to use the '\-u' option.
++You must be the root user in order to use the '-u' option.
+
+ DO NOT run \fBconquestd\fP as the root user itself. Although the code
+ *should* be safe, don't take my word for it.
+@@ -104,10 +104,10 @@
+ .SH "NOTIFYING THE METASERVER"
+ .PP
+ If you are going to run a server that will be available to the public
+-via the Internet, you should pass the '\-m' option to conquestd when
++via the Internet, you should pass the '-m' option to conquestd when
+ you start it.
+
+-When running with the '\-m' option, conquestd will contact the Conquest
++When running with the '-m' option, conquestd will contact the Conquest
+ Meta Server running at conquest.radscan.com, and announce your server,
+ so that other people will know about it.
+
+@@ -120,11 +120,11 @@
+ to it to play.
+
+ The list of currently active servers can be seen in the game by
+-running your client (conquestgl or conquest) with the '\-m' flag.
++running your client (conquestgl or conquest) with the '-m' flag.
+
+ You can also point your web browser to:
+
+- \fIhttp://radscan.com/cgi\-bin/conqmeta.pl\fP
++ \fIhttp://radscan.com/cgi-bin/conqmeta.pl\fP
+
+ If you want to be primitive, you can see the current list of servers
+ in raw format by simply:
+@@ -150,10 +150,10 @@
+ If you restrict outbound internet connections, you might want to
+ allow the following outgoing ports:
+
+-1700/tcp \- if you want clients to be able to query the
++1700/tcp - if you want clients to be able to query the
+ metaserver for active servers.
+
+-1700/udp \- if you want your own server to be able to announce
++1700/udp - if you want your own server to be able to announce
+ it's availability to the metaserver at conquest.radscan.com.
+ .SH "EXPIRING USERS"
+ .PP
+@@ -162,11 +162,11 @@
+
+ A user is expired:
+
+-A) if the user is a non OPER or non robot user \- no expiration is
++A) if the user is a non OPER or non robot user - no expiration is
+ ever done on these users.
+
+ B) the user hasn't entered the game in 'user_expiredays' days,
+-which is set in the system\(hywide conquestrc file.
++which is set in the system-wide conquestrc file.
+
+ C) the user isn't currently flying a ship.
+
+@@ -180,20 +180,20 @@
+
+ .SH "EXAMPLES"
+ .TP 8
+-.B conquestd \-d
++.B conquestd -d
+ This is \fBconquestd\fP simplest (and insecure) form. It kicks off
+ into the background (running as your UID) and serves a conquest game.
+ .TP 8
+-.B conquestd \-d \-u nobody
++.B conquestd -d -u nobody
+ When started as the root user, this will have \fBconquestd\fP setuid to
+ the user 'nobody' (a common, unprivileged account on unix systems) and
+ begin serving connections. For an Internet accessable server, these
+ are the recommended minimum options to use.
+ .TP 8
+-.B conquestd \-d \-u nobody \-l
++.B conquestd -d -u nobody -l
+ Run the server us user \fInobody\fP, serving only local clients.
+ .TP 8
+-.B conquestd \-d \-u nobody \-m \-N conquest.radscan.com
++.B conquestd -d -u nobody -m -N conquest.radscan.com
+ Run the server us user \fInobody\fP, announcing your server to the
+ conquest meta server, and tell the meta server that Internet clients
+ should use the hostname \fIconquest.radscan.com\fP to connect to your
+@@ -222,12 +222,12 @@
+ conqinitrc and texturesrc files.
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
++Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
+ ARTISTIC License.
+ .PP
+ Original VAX/VMS Ratfor Conquest:
+ .PP
+-Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
++Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
+ use, copy, modify, and distribute this software and its documentation
+ for any purpose and without fee is hereby granted, provided that this
+ copyright notice appear in all copies and in all supporting
+diff -urN conquest-8.3/conquest.man conquest-8.3.orig/conquest.man
+--- conquest-8.3/conquest.man 2007-12-14 07:42:26.000000000 -0500
++++ conquest-8.3.orig/conquest.man 2006-11-27 17:34:44.000000000 -0500
@@ -13,13 +13,13 @@
\fBconquest\fP [OPTIONS]...
.SH DESCRIPTION
.PP
--Conquest is a multi-player, real-time space combat game. The object
--of the game is twofold. The short-range goal is to accumulate "kills"
-+Conquest is a multi\(hyplayer, real\(hytime space combat game. The object
-+of the game is twofold. The short\(hyrange goal is to accumulate "kills"
+-Conquest is a multi\(hyplayer, real\(hytime space combat game. The object
+-of the game is twofold. The short\(hyrange goal is to accumulate "kills"
++Conquest is a multi-player, real-time space combat game. The object
++of the game is twofold. The short-range goal is to accumulate "kills"
by shooting down enemy players. You get one kill point for each enemy
ship shot down, plus some extra if the enemy had kills too. The major
weapon used to shoot down ships is the photon torpedo.
.PP
--The long-range goal is to conquer the universe for your team by taking
-+The long\(hyrange goal is to conquer the universe for your team by taking
+-The long\(hyrange goal is to conquer the universe for your team by taking
++The long-range goal is to conquer the universe for your team by taking
every \fIcore\fP planet. You take planets by killing off the enemy's armies via
bombardment, and then beaming your team's armies down. When all the
planets have been taken, the game ends, a new game begins, and the
@@ -255,10 +348,10 @@
maximum warp. The ships teams have different top speeds: 8 for Cruisers, 9
for Destroyers, and 10 for Scouts.
.TP 8
--.B -,+
--Use \fB+\fP to raise your energy shields, \fB-\fP to lower them. Shields
-+.B \-,+
-+Use \fB+\fP to raise your energy shields, \fB\-\fP to lower them. Shields
+-.B \-,+
+-Use \fB+\fP to raise your energy shields, \fB\-\fP to lower them. Shields
++.B -,+
++Use \fB+\fP to raise your energy shields, \fB-\fP to lower them. Shields
protect you from enemy weapons; however, it takes more fuel and heat
to fly with them up.
.TP 8
@@ -266,8 +359,8 @@
the arrow keys (see below), a ship number (precede it with an 's'), or
a planet name. If you set course for a planet, you have the option of
locking on to it by terminating the line with a TAB instead of a
--carriage return - then you will orbit automatically when you get
-+carriage return \- then you will orbit automatically when you get
+-carriage return \- then you will orbit automatically when you get
++carriage return - then you will orbit automatically when you get
there.
.TP 8
.B p,P
@@ -275,8 +368,8 @@
specify the direction to fire using either degrees or the arrow keys.
.TP 8
.B *,d,D
--Lower case \fBd\fP or \fB*\fP detonates near-by enemy torps before they get
-+Lower case \fBd\fP or \fB*\fP detonates nearby enemy torps before they get
+-Lower case \fBd\fP or \fB*\fP detonates nearby enemy torps before they get
++Lower case \fBd\fP or \fB*\fP detonates near-by enemy torps before they get
close enough to damage you. Use this command *alot*. Upper case \fBD\fP
detonates your own torps, for instance in case you missed. Since you
can only have nine torps out at a time, this can be useful.
@@ -284,8 +377,8 @@
.TP 8
.B b
Once you have blasted a planet down to three armies, you can beam your
--own armies down to do hand-to-hand combat and replace them.
-+own armies down to do hand\(hyto\(hyhand combat and replace them.
+-own armies down to do hand\(hyto\(hyhand combat and replace them.
++own armies down to do hand-to-hand combat and replace them.
.TP 8
.B m
Use the \fBm\fP command to send messages. You can send to single ships
@@ -293,13 +386,13 @@
Pressing TAB will show you the 'next' last information you asked for.
.TP 8
.B Q
--The only way out besides getting killed is to self-destruct. There is
--a 15-second time delay because it is not honorable to quit in the heat
-+The only way out besides getting killed is to self\(hydestruct. There is
-+a 15\(hysecond time delay because it is not honorable to quit in the heat
+-The only way out besides getting killed is to self\(hydestruct. There is
+-a 15\(hysecond time delay because it is not honorable to quit in the heat
++The only way out besides getting killed is to self-destruct. There is
++a 15-second time delay because it is not honorable to quit in the heat
of battle. If the server has the \fIVacant\fP flag enabled, then you
--can use the Control-Backslash key to quit immediately, leaving your
-+can use the Control\(hyBackslash key to quit immediately, leaving your
+-can use the Control\(hyBackslash key to quit immediately, leaving your
++can use the Control-Backslash key to quit immediately, leaving your
ship intact. If you decide to go \fIVacant\fP, be careful where you
leave your ship. :)
.TP 8
@@ -307,8 +400,8 @@
Cloaking device. You can activate the cloaking device by typing \fBC\fP
followed by a TAB. While the cloaking device is in operation, you are
invisible, even to your teammates. However, the cloaker uses a LOT of
--energy - so much that you can't use your weapons while it's on. A
-+energy \- so much that you can't use your weapons while it's on. A
+-energy \- so much that you can't use your weapons while it's on. A
++energy - so much that you can't use your weapons while it's on. A
second \fBC\fP will turn it off again.
.TP 8
.B E
@@ -316,8 +409,8 @@
.TP 8
.B K
Attempt a coup. If all of your team's armies get killed, you may think
--you are in deep fecal matter. Not so - you can still get some back by
-+you are in deep fecal matter. Not so \- you can still get some back by
+-you are in deep fecal matter. Not so \- you can still get some back by
++you are in deep fecal matter. Not so - you can still get some back by
pulling a coup. Try it.
.TP 8
.B L
@@ -325,16 +418,16 @@
The easiest and quickest way to change direction is with the direction
keys or the keypad if your terminal definition supports it. However,
if you are prompted to enter a direction, for example to fire phasers,
--or set course, you can use the letters "qweadzxc" on the left-hand
-+or set course, you can use the letters "qweadzxc" on the left\(hyhand
+-or set course, you can use the letters "qweadzxc" on the left\(hyhand
++or set course, you can use the letters "qweadzxc" on the left-hand
side of your keyboard, called "direction keys" for historical
reasons. The keys are assumed to be arranged as follows (if you have a
Dvorak keyboard, you are in trouble):
Q W E
\\|/
-- A--+--D
-+ A\-\-+\-\-D
+- A\-\-+\-\-D
++ A--+--D
/|\\
Z X C
@@ -342,8 +435,8 @@
nearest friendly (repair) planet
.TP 8
.B nfp
--nearest friendly class-M (fuel) planet
-+nearest friendly class\(hyM (fuel) planet
+-nearest friendly class\(hyM (fuel) planet
++nearest friendly class-M (fuel) planet
.TP 8
.B nap
nearest planet with available armies (greater than 3 total armies)
@@ -351,25 +444,25 @@
of armies won't be considered. For example, \fBna8\fP specifies the
nearest planet with 8 (eight) or more armies, \fBnf14\fP is the nearest
fuel planet with 14 or more armies, \fBnep1000\fP is the nearest
--non-scanned planet.
-+non\(hyscanned planet.
+-non\(hyscanned planet.
++non-scanned planet.
You can find info out about the second nearest object by terminating
your information request with a TAB instead of a carriage return. For
example, to find out about the second nearest planet type
\fBinp<TAB>\fP.
--You can't use these when firing weapons - that would be too easy.
-+You can't use these when firing weapons \- that would be too easy.
+-You can't use these when firing weapons \- that would be too easy.
++You can't use these when firing weapons - that would be too easy.
.SH "MACROS"
.PP
Macros are sequences of Conquest commands that are issued when a
Function Key (Fkey) or mouse button (OpenGL client only) is hit. On
--PC hardware, these are the F1-F12 keys. With certain emulators the
--Shifted F1-12 keys (F13-F24) are available too.
-+PC hardware, these are the F1\-F12 keys. With certain emulators the
-+Shifted F1\-12 keys (F13\-F24) are available too.
+-PC hardware, these are the F1\-F12 keys. With certain emulators the
+-Shifted F1\-12 keys (F13\-F24) are available too.
++PC hardware, these are the F1-F12 keys. With certain emulators the
++Shifted F1-12 keys (F13-F24) are available too.
With the GL client, version 8.1.2f or better, support for assigning
macros to mouse buttons is also provided. Modifiers like Alt,
@@ -377,8 +470,8 @@
.PP
Here is a quick command reference.
-- 0-9,= set warp factor (= is 10)
-+ 0\-9,= set warp factor (= is 10)
+- 0\-9,= set warp factor (= is 10)
++ 0-9,= set warp factor (= is 10)
A change w/e allocations
b beam armies
B bombard a planet
@@ -386,19 +479,19 @@
o come into orbit
p launch photon torpedoes
P launch photon torpedo burst
-- Q initiate self-destruct
-+ Q initiate self\(hydestruct
+- Q initiate self\(hydestruct
++ Q initiate self-destruct
r refit your ship
R enter repair mode
S more user statistics
t engage tractor beams
T team list
-- u un-engage tractor beams
-+ u unengage tractor beams
+- u unengage tractor beams
++ u un-engage tractor beams
U user statistics
W set war or peace
-- - lower shields
-+ \- lower shields
+- \- lower shields
++ - lower shields
+ raise shields
/ player list
? planet list
@@ -406,174 +499,32 @@
conqinitrc and texturesrc files.
.SH "COPYRIGHT"
.PP
--Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
-+Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
+-Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
++Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
ARTISTIC License.
.PP
Original VAX/VMS Ratfor Conquest:
.PP
--Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
-+Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
+-Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
++Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
use, copy, modify, and distribute this software and its documentation
for any purpose and without fee is hereby granted, provided that this
copyright notice appear in all copies and in all supporting
-only in patch2:
-unchanged:
---- conquest-8.3.orig/conquestd.man
-+++ conquest-8.3/conquestd.man
-@@ -1,4 +1,4 @@
--.\" $Id: conquestd.man 576 2006-08-20 05:51:33Z jon $
-+.\" $Id: conquestd.man 576 2006\-08\-20 05:51:33Z jon $
- .TH "conquestd" 6 "" ""
- .SH NAME
- conquestd \- a Conquest game server
-@@ -68,7 +68,7 @@
-
- In it's simplest (and insecure) form, you can simply run:
-
-- $ conquestd -d
-+ $ conquestd \-d
-
- This will start \fBconquestd\fP, which will fork itself into the background
- and run as your user id.
-@@ -85,18 +85,18 @@
- To support internet playes securely, start \fBconquestd\fP as root,
- and have it run as user 'nobody' by passing the \fB\-u nobody\fP option on
- the command line. Of course you can create and use some other
--non-privileged, non-interactive user for this task as well.
-+non\(hyprivileged, non\(hyinteractive user for this task as well.
-
- Something like the following is a good idea:
-
-- # conquestd -d -u nobody
-+ # conquestd \-d \-u nobody
-
- This will have \fBconquestd\fP setuid() permanently to user 'nobody' before
- beginning operations. On most unix systems, user 'nobody' has no home
- directory, password, or privileges, and therefore is a safe user id to
- run under.
-
--You must be the root user in order to use the '-u' option.
-+You must be the root user in order to use the '\-u' option.
-
- DO NOT run \fBconquestd\fP as the root user itself. Although the code
- *should* be safe, don't take my word for it.
-@@ -104,10 +104,10 @@
- .SH "NOTIFYING THE METASERVER"
- .PP
- If you are going to run a server that will be available to the public
--via the Internet, you should pass the '-m' option to conquestd when
-+via the Internet, you should pass the '\-m' option to conquestd when
- you start it.
-
--When running with the '-m' option, conquestd will contact the Conquest
-+When running with the '\-m' option, conquestd will contact the Conquest
- Meta Server running at conquest.radscan.com, and announce your server,
- so that other people will know about it.
-
-@@ -120,11 +120,11 @@
- to it to play.
-
- The list of currently active servers can be seen in the game by
--running your client (conquestgl or conquest) with the '-m' flag.
-+running your client (conquestgl or conquest) with the '\-m' flag.
-
- You can also point your web browser to:
-
-- \fIhttp://radscan.com/cgi-bin/conqmeta.pl\fP
-+ \fIhttp://radscan.com/cgi\-bin/conqmeta.pl\fP
-
- If you want to be primitive, you can see the current list of servers
- in raw format by simply:
-@@ -150,10 +150,10 @@
- If you restrict outbound internet connections, you might want to
- allow the following outgoing ports:
-
--1700/tcp - if you want clients to be able to query the
-+1700/tcp \- if you want clients to be able to query the
- metaserver for active servers.
-
--1700/udp - if you want your own server to be able to announce
-+1700/udp \- if you want your own server to be able to announce
- it's availability to the metaserver at conquest.radscan.com.
- .SH "EXPIRING USERS"
- .PP
-@@ -162,11 +162,11 @@
-
- A user is expired:
-
--A) if the user is a non OPER or non robot user - no expiration is
-+A) if the user is a non OPER or non robot user \- no expiration is
- ever done on these users.
-
- B) the user hasn't entered the game in 'user_expiredays' days,
--which is set in the system-wide conquestrc file.
-+which is set in the system\(hywide conquestrc file.
-
- C) the user isn't currently flying a ship.
-
-@@ -180,20 +180,20 @@
-
- .SH "EXAMPLES"
- .TP 8
--.B conquestd -d
-+.B conquestd \-d
- This is \fBconquestd\fP simplest (and insecure) form. It kicks off
- into the background (running as your UID) and serves a conquest game.
- .TP 8
--.B conquestd -d -u nobody
-+.B conquestd \-d \-u nobody
- When started as the root user, this will have \fBconquestd\fP setuid to
- the user 'nobody' (a common, unprivileged account on unix systems) and
- begin serving connections. For an Internet accessable server, these
- are the recommended minimum options to use.
- .TP 8
--.B conquestd -d -u nobody -l
-+.B conquestd \-d \-u nobody \-l
- Run the server us user \fInobody\fP, serving only local clients.
- .TP 8
--.B conquestd -d -u nobody -m -N conquest.radscan.com
-+.B conquestd \-d \-u nobody \-m \-N conquest.radscan.com
- Run the server us user \fInobody\fP, announcing your server to the
- conquest meta server, and tell the meta server that Internet clients
- should use the hostname \fIconquest.radscan.com\fP to connect to your
-@@ -222,12 +222,12 @@
- conqinitrc and texturesrc files.
- .SH "COPYRIGHT"
- .PP
--Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
-+Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
- ARTISTIC License.
- .PP
- Original VAX/VMS Ratfor Conquest:
- .PP
--Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
-+Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
- use, copy, modify, and distribute this software and its documentation
- for any purpose and without fee is hereby granted, provided that this
- copyright notice appear in all copies and in all supporting
-only in patch2:
-unchanged:
---- conquest-8.3.orig/conquestsh.man
-+++ conquest-8.3/conquestsh.man
-@@ -1,4 +1,4 @@
--.\" $Id: conqmetad.man 551 2006-07-17 04:43:10Z jon $
-+.\" $Id: conqmetad.man 551 2006\-07\-17 04:43:10Z jon $
- .TH "conquestsh" 6 "" ""
- .SH NAME
- conquestsh \- a Conquest shell for telnet players
+diff -urN conquest-8.3/conquestsh.man conquest-8.3.orig/conquestsh.man
+--- conquest-8.3/conquestsh.man 2007-12-14 07:42:56.000000000 -0500
++++ conquest-8.3.orig/conquestsh.man 2006-08-19 21:18:16.000000000 -0400
@@ -42,12 +42,12 @@
conqinitrc and texturesrc files.
.SH "COPYRIGHT"
.PP
--Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
-+Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
+-Copyright (C)1994\-2006 by Jon Trulson <jon at radscan.com> under the
++Copyright (C)1994-2006 by Jon Trulson <jon at radscan.com> under the
ARTISTIC License.
.PP
Original VAX/VMS Ratfor Conquest:
.PP
--Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
-+Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
+-Copyright (C)1983\-1986 by Jef Poskanzer and Craig Leres. Permission to
++Copyright (C)1983-1986 by Jef Poskanzer and Craig Leres. Permission to
use, copy, modify, and distribute this software and its documentation
for any purpose and without fee is hereby granted, provided that this
copyright notice appear in all copies and in all supporting
More information about the Pkg-games-commits
mailing list