[SCM] Maintenance of the burgerspace game branch, master, updated. debian/1.8.4-2-5-g8dfa5aa

[Francois Marier]

The following commit has been merged in the master branch:
commit adccac60608fa1a4a62e3175176a3a1fe0c5bb97
Author: Francois Marier <francois at debian.org>
Date:   Mon May 17 18:06:36 2010 +1200

    Fix manpage hyphens in a separate patch

diff --git a/debian/changelog b/debian/changelog
index f828c41..816e890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,11 @@ burgerspace (1.9.0-1) unstable; urgency=low
   * New upstream release:
     - new experimental 2-player network play
     - F11 toggles fullscreen mode
+
   * Add a patch to fix the categories of the .desktop menu icon
+  * Fix manpage hyphens in a separate patch
 
- -- Francois Marier <francois at debian.org>  Mon, 17 May 2010 17:55:53 +1200
+ -- Francois Marier <francois at debian.org>  Mon, 17 May 2010 18:06:11 +1200
 
 burgerspace (1.8.4-2) unstable; urgency=medium
 
diff --git a/debian/patches/manpage_fixes.patch b/debian/patches/manpage_fixes.patch
new file mode 100644
index 0000000..23e483f
--- /dev/null
+++ b/debian/patches/manpage_fixes.patch
@@ -0,0 +1,45 @@
+Description: fix hyphens in manpages
+Author: Francois Marier <francois at debian.org>
+Forwarded: sarrazip at sarrazip.com
+Last-Update: 2010-05-17
+
+--- a/doc/burgerspace-server.6
++++ b/doc/burgerspace-server.6
+@@ -43,12 +43,12 @@ used to specify a non-default listening port (see below).
+ After the server has started, the user who wants to control the chef
+ must start the client with this command:
+ .PP
+-burgerspace --server=the.server.hostname.com --chef
++burgerspace \-\-server=the.server.hostname.com \-\-chef
+ .PP
+-Use the appropriate hostname or IP address as the argument for --server.
+-The user who wants to control the egg must give the --enemy option instead
+-of --chef.
+-The --port option can be added to the burgerspace command-line to specify
++Use the appropriate hostname or IP address as the argument for \-\-server.
++The user who wants to control the egg must give the \-\-enemy option instead
++of \-\-chef.
++The \-\-port option can be added to the burgerspace command-line to specify
+ the server port, if the server was started with a non-default UDP listening
+ port.
+ .PP
+diff --git a/doc/burgerspace.6 b/doc/burgerspace.6
+index 9bc73ad..ef4c1c7 100644
+--- a/doc/burgerspace.6
++++ b/doc/burgerspace.6
+@@ -90,13 +90,13 @@ Minimum is 1.  Maximum is 1000.  50 means 20 frames per second.
+ \fB\-\-server=HOSTNAME\fR
+ Start as a client that connects to a BurgerSpace server running
+ on the given host or IP address.
+-Examples: --server=localhost, --server=192.168.1.2
++Examples: \-\-server=localhost, \-\-server=192.168.1.2
+ If this option is not given, the program starts as a stand-alone game
+ that does not try to connect to any server.
+ .TP
+ \fB\-\-port=PORT\fR
+ UDP port number on which the BurgerSpace server is running.
+-This option is only useful with --server.
++This option is only useful with \-\-server.
+ The default is 49152.
+ .SH LICENSE
+ This program is free software; you may redistribute it under the terms of
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7ddde54
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix_menu_categories.patch
+manpage_fixes.patch

-- 
Maintenance of the burgerspace game