[SCM] Packaging for bzflag branch, master, updated. upstream/2.0.16-61-g70bed9d

[Ryan Kavanagh]

The following commit has been merged in the master branch:
commit 98a0aa091c9b39e89e9f05a9ec407b7c4b424492
Author: Ryan Kavanagh <rak at debian.org>
Date:   Sun Jul 22 13:12:08 2012 -0400

    Fix ill adjusting manpage (02_man_adjust_line.diff)

diff --git a/debian/patches/02_man_adjust_line.diff b/debian/patches/02_man_adjust_line.diff
new file mode 100644
index 0000000..96482c5
--- /dev/null
+++ b/debian/patches/02_man_adjust_line.diff
@@ -0,0 +1,21 @@
+Description: Fix un-adjusting line
+ W: bzflag-server: manpage-has-errors-from-man usr/share/man/man6/bzfs.6.gz 55: warning [p 1, 3.0i]: cannot adjust line
+Author: Ryan Kavanagh <rak at debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2012-07-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: bzflag/man/bzfs.6.in
+===================================================================
+--- bzflag.orig/man/bzfs.6.in	2012-07-22 12:11:13.087459311 -0400
++++ bzflag/man/bzfs.6.in	2012-07-22 12:47:03.918124704 -0400
+@@ -52,7 +52,7 @@
+ [\fB\-lagwarn \fR\fImilliseconds\fR]
+ [\fB\-masterBanURL \fIURL\fR]
+ [\fB\-maxidle \fR\fIseconds\fR]
+-[\fB\-mp \fR{\fIcount\fR|[\fIrogue\-count\fR]\fB,\fR[\fIred\-count\fR]\fB,\fR[\fIgreen\-count\fR]\fB,\fR[\fIblue\-count\fR]\fB,\fR[\fIpurple\-count\fR],\fR[\fIobserver\-count\fR]}]
++[\fB\-mp \fR{\fIcount\fR\~|\~[\fIrogue\-count\fR]\fB,\fR[\fIred\-count\fR]\fB,\fR[\fIgreen\-count\fR]\fB,\fR[\fIblue\-count\fR]\fB,\fR[\fIpurple\-count\fR],\fR[\fIobserver\-count\fR]}]
+ [\fB\-mps \fR\fImax\-score\fR]
+ [\fB\-ms \fIshots\fR]
+ [\fB\-mts \fR\fImax\-score\fR]
diff --git a/debian/patches/series b/debian/patches/series
index bcdc6ad..5cd7765 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_man_hyphens_as_minus.diff
+02_man_adjust_line.diff

-- 
Packaging for bzflag