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

Fri Feb 6 21:13:29 UTC 2009

Author: bdefreese
Date: 2009-02-06 21:13:29 +0000 (Fri, 06 Feb 2009)
New Revision: 8748

Modified:
   packages/trunk/conquest/debian/
   packages/trunk/conquest/debian/changelog
   packages/trunk/conquest/debian/conquest.docs
   packages/trunk/conquest/debian/control
   packages/trunk/conquest/debian/patches/01_man_pages.diff
   packages/trunk/conquest/debian/patches/02_soname.diff
Log:
  * New upstream release. (Closes: #498856).
    + Trim down 01_man_pages patch to apply against new source.
  * Update my e-mail address.
  * Add descriptions for quilt patches.
  * Update debian/conquest.docs to use newer version.txt file.
Update svn-bp:origUrl property.



Property changes on: packages/trunk/conquest/debian
___________________________________________________________________
Name: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/conquest_8.3.orig.tar.gz
   + http://pkg-games.alioth.debian.org/tarballs/conquest_8.4.1.orig.tar.gz

Modified: packages/trunk/conquest/debian/changelog
===================================================================

--- packages/trunk/conquest/debian/changelog	2009-02-06 18:25:41 UTC (rev 8747)
+++ packages/trunk/conquest/debian/changelog	2009-02-06 21:13:29 UTC (rev 8748)
@@ -1,5 +1,6 @@
-conquest (8.3-4) UNRELEASED; urgency=low
+conquest (8.4.1-1) UNRELEASED; urgency=low
 
+  [ Evgeni Golov ]
   * debian/changelog:
     + Fix spelling of similar in the last changelog entry, thanks lintian.
   * debian/control:
@@ -7,8 +8,15 @@
   * debian/README.source:
     + Added hints on quilt-usage.
 
- -- Evgeni Golov <sargentd at die-welt.net>  Mon, 03 Nov 2008 18:01:30 +0100
+  [ Barry deFreese ]
+  * New upstream release. (Closes: #498856).
+    + Trim down 01_man_pages patch to apply against new source.
+  * Update my e-mail address.
+  * Add descriptions for quilt patches.
+  * Update debian/conquest.docs to use newer version.txt file.
 
+ -- Barry deFreese <bdefreese at debian.org>  Fri, 06 Feb 2009 15:50:41 -0500
+
 conquest (8.3-3) unstable; urgency=low
 
   * debian/conquest-server.dirs:

Modified: packages/trunk/conquest/debian/conquest.docs
===================================================================
--- packages/trunk/conquest/debian/conquest.docs	2009-02-06 18:25:41 UTC (rev 8747)
+++ packages/trunk/conquest/debian/conquest.docs	2009-02-06 21:13:29 UTC (rev 8748)
@@ -1,2 +1,2 @@
-conquest-8.3.txt
+conquest-8.4.1.txt
 README

Modified: packages/trunk/conquest/debian/control
===================================================================
--- packages/trunk/conquest/debian/control	2009-02-06 18:25:41 UTC (rev 8747)
+++ packages/trunk/conquest/debian/control	2009-02-06 21:13:29 UTC (rev 8748)
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Barry deFreese <bddebian at comcast.net>, 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>, Evgeni Golov <sargentd at die-welt.net>
 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 18:25:41 UTC (rev 8747)
+++ packages/trunk/conquest/debian/patches/01_man_pages.diff	2009-02-06 21:13:29 UTC (rev 8748)
@@ -1,3 +1,5 @@
+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
@@ -131,60 +133,6 @@
 +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-15 08:29:58.000000000 -0500
-@@ -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.
- .PP
- The meta server listens on port UDP port 1700 for announcements from
- \fBconquestd\fP servers.  TCP connections to port 1700 cause
-@@ -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
--ARTISTIC License.
--.PP
--Original VAX/VMS Ratfor Conquest:
--.PP
--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
--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-15 08:30:51.000000000 -0500
@@ -305,160 +253,6 @@
 -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-15 08:35:07.000000000 -0500
-@@ -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,59 +180,27 @@
- 
- .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
- 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
--ARTISTIC License.
--.PP
--Original VAX/VMS Ratfor Conquest:
--.PP
--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
--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-15 08:38:12.000000000 -0500

Modified: packages/trunk/conquest/debian/patches/02_soname.diff
===================================================================
--- packages/trunk/conquest/debian/patches/02_soname.diff	2009-02-06 18:25:41 UTC (rev 8747)
+++ packages/trunk/conquest/debian/patches/02_soname.diff	2009-02-06 21:13:29 UTC (rev 8748)
@@ -1,3 +1,5 @@
+Add -avoid-version to LDFLAGS.
+
 --- conquest-8.3.orig/Makefile.am	2007-07-16 20:23:01.000000000 +0200
 +++ conquest-8.3/Makefile.am	2007-12-17 22:04:28.000000000 +0100
 @@ -59,21 +59,21 @@


