r4957 - packages/trunk/conquest/debian/patches

Barry deFreese bddebian-guest at alioth.debian.org
Sat Dec 15 18:44:36 UTC 2007 

Author: bddebian-guest
Date: 2007-12-15 18:44:35 +0000 (Sat, 15 Dec 2007)
New Revision: 4957

Modified:
   packages/trunk/conquest/debian/patches/01_man_pages.diff
Log:
Update man page patch


Modified: packages/trunk/conquest/debian/patches/01_man_pages.diff
===================================================================
--- packages/trunk/conquest/debian/patches/01_man_pages.diff	2007-12-15 18:42:35 UTC (rev 4956)
+++ packages/trunk/conquest/debian/patches/01_man_pages.diff	2007-12-15 18:44:35 UTC (rev 4957)
@@ -1,6 +1,6 @@
 diff -urN conquest-8.3.orig/conqai.man conquest-8.3/conqai.man
 --- conquest-8.3.orig/conqai.man	2006-09-01 01:45:42.000000000 -0400
-+++ conquest-8.3/conqai.man	2007-12-14 07:25:48.000000000 -0500
++++ conquest-8.3/conqai.man	2007-12-15 08:28:00.000000000 -0500
 @@ -4,7 +4,7 @@
  conqai \(em Conquest AI override program 
  .SH "SYNOPSIS" 
@@ -19,42 +19,79 @@
  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.
-@@ -34,12 +34,12 @@
+@@ -29,20 +29,9 @@
+ conquest (6), conqoper (6), conqstrat (6). 
+ .SH "AUTHOR" 
+ .PP 
++Jon Trulson <jon at radscan.com>
++
+ This manual page was originally written by Clint Adams
+ <schizo at debian.org> for the \fBDebian\fP system (but may be used by
  others).  Permission is granted to copy, distribute and/or modify this
  document under the terms of the GNU GPL.  Conquest is
- .PP
+-.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
+-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
+-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
+-documentation. Jef Poskanzer and Craig Leres make no representations
+-about the suitability of this software for any purpose. It is provided
+-"as is" without express or implied warranty.
 diff -urN conquest-8.3.orig/conqdriv.man conquest-8.3/conqdriv.man
 --- conquest-8.3.orig/conqdriv.man	2006-08-20 01:51:32.000000000 -0400
-+++ conquest-8.3/conqdriv.man	2007-12-14 07:41:18.000000000 -0500
-@@ -47,12 +47,12 @@
- conqinitrc and texturesrc files.
- .SH "COPYRIGHT"
++++ conquest-8.3/conqdriv.man	2007-12-15 08:26:52.000000000 -0500
+@@ -23,41 +23,10 @@
+ .B \-f
+ Force any other \fBconqdriv\fP process to terminate, and assume direct
+ control of the universe.
+-.SH "AUTHOR"
+-Jon Trulson
+ .SH "SEE ALSO"
  .PP
+ conquest(6), conquestd(6), conqoper(6), conqdriv(6), conquestsh(6),
+ conqmetad(6) 
+-.PP
+-See README in the conquest distribution (usually installed in
+-<conquest install prefix>/etc/) for information and tips on how to
+-play. 
+-.PP
+-See INSTALL for instructions on unpacking, compiling, and installing
+-conquest, as well as information on terminfo requirements (for the
+-curses client) and other system specific issues.
+-.PP
+-See README.cygwin for information on building/using conquest on MS
+-Windows systems. 
+-.PP
+-See HISTORY for the latest news and modification history.
+-.PP
+-See CONQINIT.TXT for information on CQI, and the format of the
+-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
+-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
+-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
+-documentation. Jef Poskanzer and Craig Leres make no representations
+-about the suitability of this software for any purpose. It is provided
+-"as is" without express or implied warranty.
+-
++.SH "AUTHOR"
++Jon Trulson <jon at radscan.com>
+ 
 diff -urN conquest-8.3.orig/conqinit.man conquest-8.3/conqinit.man
 --- conquest-8.3.orig/conqinit.man	2007-05-26 22:27:45.000000000 -0400
-+++ conquest-8.3/conqinit.man	2007-12-14 07:41:30.000000000 -0500
++++ conquest-8.3/conqinit.man	2007-12-15 08:28:56.000000000 -0500
 @@ -9,14 +9,14 @@
  .PP
  \fBconqinit\fP can be used to test the parser, perform syntax checking
@@ -72,18 +109,31 @@
  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
-@@ -92,7 +92,7 @@
- by \fBconqinit\fP, as well as other information not mentioned here.
- .SH "COPYRIGHT"
+@@ -80,19 +80,11 @@
+         your definitions will be used as the default planet
+         configuration. 
+ 
+-.SH "AUTHOR"
+-Jon Trulson
+ .SH "SEE ALSO"
  .PP
+ conquestd(6), conqoper(6), conqdriv(6), conquestsh(6),
+ conqmetad(6) 
+-.PP
+-See the CONQINIT.TXT file in the src distribution (or on the conquest
+-web page) for detailed information on the syntax of the files parsed
+-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
- ARTISTIC License.
+-ARTISTIC License.
++.SH "AUTHOR"
++Jon Trulson <jon at radscan.com>
  
  
 diff -urN conquest-8.3.orig/conqmetad.man conquest-8.3/conqmetad.man
 --- conquest-8.3.orig/conqmetad.man	2006-08-20 01:51:32.000000000 -0400
-+++ conquest-8.3/conqmetad.man	2007-12-14 07:41:45.000000000 -0500
++++ conquest-8.3/conqmetad.man	2007-12-15 08:29:58.000000000 -0500
 @@ -13,7 +13,7 @@
  \fB\-m\fP option.  This makes it easy for people to find prospective
  games. 
@@ -93,24 +143,51 @@
  .PP
  The meta server listens on port UDP port 1700 for announcements from
  \fBconquestd\fP servers.  TCP connections to port 1700 cause
-@@ -56,12 +56,12 @@
- conqinitrc and texturesrc files.
- .SH "COPYRIGHT"
+@@ -32,39 +32,9 @@
+ .TP 8
+ .B \-u <user>
+ Run as user \fIuser\fP.  
+-.SH "AUTHOR"
+-Jon Trulson
+ .SH "SEE ALSO"
  .PP
+ conquest(6), conquestd(6), conqoper(6), conqdriv(6), conquestsh(6),
+ conqmetad(6) 
+-.PP
+-See README in the conquest distribution (usually installed in
+-<conquest install prefix>/etc/) for information and tips on how to
+-play. 
+-.PP
+-See INSTALL for instructions on unpacking, compiling, and installing
+-conquest, as well as information on terminfo requirements (for the
+-curses client) and other system specific issues.
+-.PP
+-See README.cygwin for information on building/using conquest on MS
+-Windows systems. 
+-.PP
+-See HISTORY for the latest news and modification history.
+-.PP
+-See CONQINIT.TXT for information on CQI, and the format of the
+-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
+-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
+-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
+-documentation. Jef Poskanzer and Craig Leres make no representations
+-about the suitability of this software for any purpose. It is provided
+-"as is" without express or implied warranty.
++.SH "AUTHOR"
++Jon Trulson <jon at radscan.com>
 diff -urN conquest-8.3.orig/conqoper.man conquest-8.3/conqoper.man
 --- conquest-8.3.orig/conqoper.man	2006-08-20 01:51:32.000000000 -0400
-+++ conquest-8.3/conqoper.man	2007-12-14 07:41:58.000000000 -0500
++++ conquest-8.3/conqoper.man	2007-12-15 08:30:51.000000000 -0500
 @@ -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.
@@ -120,24 +197,51 @@
  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.
-@@ -71,12 +71,12 @@
- conqinitrc and texturesrc files.
- .SH "COPYRIGHT"
+@@ -47,39 +47,9 @@
+ When either the \fIuniverse\fP or \fIeverything\fP is initialized, the
+ game will be set to disabled by default.  You must manually enable the
+ game from the \fBconqoper\fP main menu, or by using the \fB\-E\fP option.
+-.SH "AUTHOR"
+-Jon Trulson
+ .SH "SEE ALSO"
  .PP
+ conquest(6), conquestd(6), conqoper(6), conqdriv(6), conquestsh(6),
+ conqmetad(6) 
+-.PP
+-See README in the conquest distribution (usually installed in
+-<conquest install prefix>/etc/) for information and tips on how to
+-play. 
+-.PP
+-See INSTALL for instructions on unpacking, compiling, and installing
+-conquest, as well as information on terminfo requirements (for the
+-curses client) and other system specific issues.
+-.PP
+-See README.cygwin for information on building/using conquest on MS
+-Windows systems. 
+-.PP
+-See HISTORY for the latest news and modification history.
+-.PP
+-See CONQINIT.TXT for information on CQI, and the format of the
+-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
+-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
+-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
+-documentation. Jef Poskanzer and Craig Leres make no representations
+-about the suitability of this software for any purpose. It is provided
+-"as is" without express or implied warranty.
++.SH "AUTHOR"
++Jon Trulson <jon at radscan.com>
 diff -urN conquest-8.3.orig/conqstrat.man conquest-8.3/conqstrat.man
 --- conquest-8.3.orig/conqstrat.man	2006-09-01 01:45:32.000000000 -0400
-+++ conquest-8.3/conqstrat.man	2007-12-14 07:25:48.000000000 -0500
++++ conquest-8.3/conqstrat.man	2007-12-15 08:31:52.000000000 -0500
 @@ -3,7 +3,7 @@
  conqstrat \(em modify Robot strategy tables 
  .SH "SYNOPSIS" 
@@ -172,7 +276,7 @@
  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
-@@ -44,7 +44,7 @@
+@@ -44,25 +44,13 @@
  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 :)
@@ -181,24 +285,29 @@
  <conqrule.easy\fP. 
  .SH "AUTHOR" 
  .PP 
-@@ -53,12 +53,12 @@
++Jon Trulson <jon at radscan.com>
++
+ This manual page was originally written by Clint Adams
+ <schizo at debian.org> for the \fBDebian\fP system (but may be used by
  others).  Permission is granted to copy, distribute and/or modify this
  document under the terms of the GNU GPL. Conquest is
- .PP
+-.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
+-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
+-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
+-documentation. Jef Poskanzer and Craig Leres make no representations
+-about the suitability of this software for any purpose. It is provided
+-"as is" without express or implied warranty.
+-
 diff -urN conquest-8.3.orig/conquestd.man conquest-8.3/conquestd.man
 --- conquest-8.3.orig/conquestd.man	2006-08-20 01:51:32.000000000 -0400
-+++ conquest-8.3/conquestd.man	2007-12-14 07:42:41.000000000 -0500
++++ conquest-8.3/conquestd.man	2007-12-15 08:35:07.000000000 -0500
 @@ -68,7 +68,7 @@
  
  In it's simplest (and insecure) form, you can simply run:
@@ -284,7 +393,7 @@
  
  C) the user isn't currently flying a ship.
  
-@@ -180,20 +180,20 @@
+@@ -180,59 +180,27 @@
  
  .SH "EXAMPLES"
  .TP 8
@@ -309,24 +418,50 @@
  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"
+ server.
+-.SH "AUTHOR"
+-Jon Trulson
+ .SH "SEE ALSO"
  .PP
+ conquest(6), conquestd(6), conqoper(6), conqdriv(6), conquestsh(6),
+ conqmetad(6) 
+-.PP
+-See README in the conquest distribution (usually installed in
+-<conquest install prefix>/etc/) for information and tips on how to
+-play. 
+-.PP
+-See INSTALL for instructions on unpacking, compiling, and installing
+-conquest, as well as information on terminfo requirements (for the
+-curses client) and other system specific issues.
+-.PP
+-See README.cygwin for information on building/using conquest on MS
+-Windows systems. 
+-.PP
+-See HISTORY for the latest news and modification history.
+-.PP
+-See CONQINIT.TXT for information on CQI, and the format of the
+-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
+-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
+-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
+-documentation. Jef Poskanzer and Craig Leres make no representations
+-about the suitability of this software for any purpose. It is provided
+-"as is" without express or implied warranty.
+-
+-
++.SH "AUTHOR"
++Jon Trulson <jon at radscan.com>
 diff -urN conquest-8.3.orig/conquest.man conquest-8.3/conquest.man
 --- conquest-8.3.orig/conquest.man	2006-11-27 17:34:44.000000000 -0500
-+++ conquest-8.3/conquest.man	2007-12-14 07:42:26.000000000 -0500
++++ conquest-8.3/conquest.man	2007-12-15 08:38:12.000000000 -0500
 @@ -13,13 +13,13 @@
  \fBconquest\fP [OPTIONS]...
  .SH DESCRIPTION
@@ -495,36 +630,92 @@
                     +      raise shields
                     /      player list
                     ?      planet list
-@@ -487,12 +487,12 @@
- conqinitrc and texturesrc files.
- .SH "COPYRIGHT"
+@@ -463,41 +463,9 @@
+                  TAB      get 'next' last info.   (like 'i<TAB>')
+ 
+ 
+-.SH "AUTHOR"
+-Jon Trulson, Jeff Poskanzer
+ .SH "SEE ALSO"
  .PP
+ conquestd(6), conqoper(6), conqdriv(6), conquestsh(6),
+ conqmetad(6), conqinit(6)
+-.PP
+-See README in the conquest distribution (usually installed in
+-<conquest install prefix>/etc/) for information and tips on how to
+-play. 
+-.PP
+-See INSTALL for instructions on unpacking, compiling, and installing
+-conquest, as well as information on terminfo requirements (for the
+-curses client) and other system specific issues.
+-.PP
+-See README.cygwin for information on building/using conquest on MS
+-Windows systems. 
+-.PP
+-See HISTORY for the latest news and modification history.
+-.PP
+-See CONQINIT.TXT for information on CQI, and the format of the
+-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
+-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
+-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
+-documentation. Jef Poskanzer and Craig Leres make no representations
+-about the suitability of this software for any purpose. It is provided
+-"as is" without express or implied warranty.
+-
+-
++.SH "AUTHOR"
++Jon Trulson <jon at radscan.com>, Jeff Poskanzer
 diff -urN conquest-8.3.orig/conquestsh.man conquest-8.3/conquestsh.man
 --- conquest-8.3.orig/conquestsh.man	2006-08-19 21:18:16.000000000 -0400
-+++ conquest-8.3/conquestsh.man	2007-12-14 07:42:56.000000000 -0500
-@@ -42,12 +42,12 @@
- conqinitrc and texturesrc files.
- .SH "COPYRIGHT"
++++ conquest-8.3/conquestsh.man	2007-12-15 08:39:24.000000000 -0500
+@@ -18,39 +18,9 @@
  .PP
+ \fBconquestsh\fP is a very simple program that should be edited for
+ your tastes. 
+-.SH "AUTHOR"
+-Jon Trulson
+ .SH "SEE ALSO"
+ .PP
+ conquest(6), conquestd(6), conqoper(6), conqdriv(6), conquestsh(6),
+ conqmetad(6) 
+-.PP
+-See README in the conquest distribution (usually installed in
+-<conquest install prefix>/etc/) for information and tips on how to
+-play. 
+-.PP
+-See INSTALL for instructions on unpacking, compiling, and installing
+-conquest, as well as information on terminfo requirements (for the
+-curses client) and other system specific issues.
+-.PP
+-See README.cygwin for information on building/using conquest on MS
+-Windows systems. 
+-.PP
+-See HISTORY for the latest news and modification history.
+-.PP
+-See CONQINIT.TXT for information on CQI, and the format of the
+-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
+-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
+-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
+-documentation. Jef Poskanzer and Craig Leres make no representations
+-about the suitability of this software for any purpose. It is provided
+-"as is" without express or implied warranty.
++.SH "AUTHOR"
++Jon Trulson <jon at radscan.com>

More information about the Pkg-games-commits mailing list