r8749 - in packages/trunk/conquest/debian: . patches

Barry deFreese bdefreese at alioth.debian.org
Fri Feb 6 22:23:09 UTC 2009 

Author: bdefreese
Date: 2009-02-06 22:23:09 +0000 (Fri, 06 Feb 2009)
New Revision: 8749

Modified:
   packages/trunk/conquest/debian/changelog
   packages/trunk/conquest/debian/control
   packages/trunk/conquest/debian/patches/01_man_pages.diff
Log:
  * Remove Evgeni Golov from Uploaders at his request.
Update patch to apply against new source.  Should work this time...


Modified: packages/trunk/conquest/debian/changelog
===================================================================
--- packages/trunk/conquest/debian/changelog	2009-02-06 21:13:29 UTC (rev 8748)
+++ packages/trunk/conquest/debian/changelog	2009-02-06 22:23:09 UTC (rev 8749)
@@ -1,4 +1,4 @@
-conquest (8.4.1-1) UNRELEASED; urgency=low
+conquest (8.4.1-1) unstable; urgency=low
 
   [ Evgeni Golov ]
   * debian/changelog:
@@ -10,8 +10,9 @@
 
   [ Barry deFreese ]
   * New upstream release. (Closes: #498856).
-    + Trim down 01_man_pages patch to apply against new source.
+    + Fix 01_man_pages patch to apply against new source.
   * Update my e-mail address.
+  * Remove Evgeni Golov from Uploaders at his request.
   * Add descriptions for quilt patches.
   * Update debian/conquest.docs to use newer version.txt file.
 

Modified: packages/trunk/conquest/debian/control
===================================================================
--- packages/trunk/conquest/debian/control	2009-02-06 21:13:29 UTC (rev 8748)
+++ packages/trunk/conquest/debian/control	2009-02-06 22:23:09 UTC (rev 8749)
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Barry deFreese <bdefreese at debian.org>, Bas Wijnen <wijnen at debian.org>, Evgeni Golov <sargentd at die-welt.net>
+Uploaders: Barry deFreese <bdefreese at debian.org>, Bas Wijnen <wijnen at debian.org>
 Build-Depends: debhelper (>> 5.0), autotools-dev, quilt, flex, bison, libncurses5-dev, zlib1g-dev, libgl1-mesa-dev | libgl-dev, freeglut3-dev | libglut-dev, libglu1-mesa-dev | libglu-dev, libxt-dev, libxi-dev, libxmu-dev, libsdl1.2-dev, libsdl-mixer1.2-dev
 Standards-Version: 3.8.0
 Homepage: http://www.radscan.com/conquest.html

Modified: packages/trunk/conquest/debian/patches/01_man_pages.diff
===================================================================
--- packages/trunk/conquest/debian/patches/01_man_pages.diff	2009-02-06 21:13:29 UTC (rev 8748)
+++ packages/trunk/conquest/debian/patches/01_man_pages.diff	2009-02-06 22:23:09 UTC (rev 8749)
@@ -1,8 +1,9 @@
 Fix hyphens used as minus in man pages.
 
-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-15 08:28:00.000000000 -0500
+Index: conquest-8.4.1/conqai.man
+===================================================================
+--- conquest-8.4.1.orig/conqai.man	2008-04-12 21:20:21.000000000 -0400
++++ conquest-8.4.1/conqai.man	2009-02-06 17:08:51.000000000 -0500
 @@ -4,7 +4,7 @@
  conqai \(em Conquest AI override program 
  .SH "SYNOPSIS" 
@@ -44,9 +45,10 @@
 -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-15 08:26:52.000000000 -0500
+Index: conquest-8.4.1/conqdriv.man
+===================================================================
+--- conquest-8.4.1.orig/conqdriv.man	2008-04-12 21:20:21.000000000 -0400
++++ conquest-8.4.1/conqdriv.man	2009-02-06 17:08:51.000000000 -0500
 @@ -23,41 +23,10 @@
  .B \-f
  Force any other \fBconqdriv\fP process to terminate, and assume direct
@@ -91,9 +93,10 @@
 +.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-15 08:28:56.000000000 -0500
+Index: conquest-8.4.1/conqinit.man
+===================================================================
+--- conquest-8.4.1.orig/conqinit.man	2008-04-12 21:20:21.000000000 -0400
++++ conquest-8.4.1/conqinit.man	2009-02-06 17:08:51.000000000 -0500
 @@ -9,14 +9,14 @@
  .PP
  \fBconqinit\fP can be used to test the parser, perform syntax checking
@@ -133,9 +136,10 @@
 +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-15 08:30:51.000000000 -0500
+Index: conquest-8.4.1/conqoper.man
+===================================================================
+--- conquest-8.4.1.orig/conqoper.man	2008-04-12 21:20:21.000000000 -0400
++++ conquest-8.4.1/conqoper.man	2009-02-06 17:08: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.
@@ -187,9 +191,10 @@
 -"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-15 08:31:52.000000000 -0500
+Index: conquest-8.4.1/conqstrat.man
+===================================================================
+--- conquest-8.4.1.orig/conqstrat.man	2008-04-12 21:20:21.000000000 -0400
++++ conquest-8.4.1/conqstrat.man	2009-02-06 17:08:51.000000000 -0500
 @@ -3,7 +3,7 @@
  conqstrat \(em modify Robot strategy tables 
  .SH "SYNOPSIS" 
@@ -253,9 +258,10 @@
 -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/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-15 08:38:12.000000000 -0500
+Index: conquest-8.4.1/conquest.man
+===================================================================
+--- conquest-8.4.1.orig/conquest.man	2008-04-12 21:20:21.000000000 -0400
++++ conquest-8.4.1/conquest.man	2009-02-06 17:10:30.000000000 -0500
 @@ -13,13 +13,13 @@
  \fBconquest\fP [OPTIONS]...
  .SH DESCRIPTION
@@ -343,7 +349,7 @@
  pulling a coup.  Try it.
  .TP 8
  .B L
-@@ -293,14 +293,14 @@
+@@ -293,19 +293,19 @@
  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,
@@ -360,6 +366,12 @@
                       /|\\
                      Z X C
  
+ You can use them singly, e.g. 'd'  would  be  0  degrees,
+-'q'  would  be  135,  etc.  You  can  also  use  them  in
++\'q'  would  be  135,  etc.  You  can  also  use  them  in
+ combination: "ed" would be halfway between 'e'  and  'd',
+ which  is  22.5  degrees; "edd" is like 'e' + 'd' + 'd' /
+ 3, or 15 degrees.
 @@ -333,7 +333,7 @@
  nearest friendly (repair) planet
  .TP 8
@@ -468,9 +480,10 @@
 -
 +.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-15 08:39:24.000000000 -0500
+Index: conquest-8.4.1/conquestsh.man
+===================================================================
+--- conquest-8.4.1.orig/conquestsh.man	2008-04-12 21:20:21.000000000 -0400
++++ conquest-8.4.1/conquestsh.man	2009-02-06 17:08:51.000000000 -0500
 @@ -18,39 +18,9 @@
  .PP
  \fBconquestsh\fP is a very simple program that should be edited for
@@ -513,3 +526,55 @@
 -"as is" without express or implied warranty.
 +.SH "AUTHOR"
 +Jon Trulson <jon at radscan.com>
+Index: conquest-8.4.1/conquestd.man
+===================================================================
+--- conquest-8.4.1.orig/conquestd.man	2009-02-06 17:09:00.000000000 -0500
++++ conquest-8.4.1/conquestd.man	2009-02-06 17:10:13.000000000 -0500
+@@ -71,7 +71,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.
+@@ -92,14 +92,14 @@
+ 
+ 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.
+@@ -107,10 +107,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.
+ 
+@@ -123,7 +123,7 @@
+ 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:
+

More information about the Pkg-games-commits mailing list