[SCM] mjpegtools/master: Refresh 04_manpage-syntax.patch (it was partially applied upstream)

[lucidfox-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6597ca10e8acfbb58842b316af17b5a3ccefbaf0
Author: Maia Kozheva <sikon at ubuntu.com>
Date:   Sun May 1 01:18:46 2011 +0700

    Refresh 04_manpage-syntax.patch (it was partially applied upstream)

diff --git a/debian/patches/04_manpage-syntax.patch b/debian/patches/04_manpage-syntax.patch
index aaa2a0e..fc99fc6 100644
--- a/debian/patches/04_manpage-syntax.patch
+++ b/debian/patches/04_manpage-syntax.patch
@@ -1,26 +1,16 @@
-diff -Nur mjpegtools-1.9.0rc3/docs/lavplay.1 mjpegtools-1.9.0rc3.new/docs/lavplay.1
---- mjpegtools-1.9.0rc3/docs/lavplay.1
-+++ mjpegtools-1.9.0rc3.new/docs/lavplay.1
-@@ -26,7 +26,7 @@
- .TP 8
- .BR \-p/\-\-playback " [" S | C | H ]
- The playback mode to be used. 'S' means software\-playback using SDL.
--'H' means hardware\-playback on the monitor (on\-screen). 'C' means
-+ 'H' means hardware\-playback on the monitor (on\-screen). 'C' means
- hardware\-playback to the video-out of the zoran video-capture device.
- Obviously, 'C' and 'H' only work on computers with zoran video\-capture
- devices.
-diff -Nur mjpegtools-1.9.0rc3/docs/mjpeg-howto.info mjpegtools-1.9.0rc3.new/docs/mjpeg-howto.info
---- mjpegtools-1.9.0rc3/docs/mjpeg-howto.info
-+++ mjpegtools-1.9.0rc3.new/docs/mjpeg-howto.info
+Index: mjpegtools/docs/mjpeg-howto.info
+===================================================================
+--- mjpegtools.orig/docs/mjpeg-howto.info	2011-04-30 23:56:13.000000000 +0700
++++ mjpegtools/docs/mjpeg-howto.info	2011-05-01 01:14:32.701597480 +0700
 @@ -1,3 +1,4 @@
 +INFO-DIR-SECTION Video
  START-INFO-DIR-ENTRY
  * mjpegtools: (mjpeg-howto).       command line tools for MPEG audio and video.
  END-INFO-DIR-ENTRY
-diff -Nur mjpegtools-1.9.0rc3/docs/mjpegtools.1 mjpegtools-1.9.0rc3.new/docs/mjpegtools.1
---- mjpegtools-1.9.0rc3/docs/mjpegtools.1
-+++ mjpegtools-1.9.0rc3.new/docs/mjpegtools.1
+Index: mjpegtools/docs/mjpegtools.1
+===================================================================
+--- mjpegtools.orig/docs/mjpegtools.1	2011-04-30 23:56:13.000000000 +0700
++++ mjpegtools/docs/mjpegtools.1	2011-05-01 01:14:32.701597480 +0700
 @@ -1,8 +1,8 @@
 -.\"
 -.TH "MJPEG tools" "MJPEG Linux Square" "MJPEG tools manual"
@@ -149,28 +139,3 @@ diff -Nur mjpegtools-1.9.0rc3/docs/mjpegtools.1 mjpegtools-1.9.0rc3.new/docs/mjp
  .fi 
  .ec
  .ft P
-diff -Nur mjpegtools-1.9.0rc3/docs/mpeg2enc.1 mjpegtools-1.9.0rc3.new/docs/mpeg2enc.1
---- mjpegtools-1.9.0rc3/docs/mpeg2enc.1
-+++ mjpegtools-1.9.0rc3.new/docs/mpeg2enc.1
-@@ -222,7 +222,8 @@
- Set verbosity level to num.  0 = warnings and errors only, 1 =
- information as well, 2=really verbose.
- .PP
--.BR -K|--custom-quant-matrices \fBkvcd\fP | \fBtmpgenc\fP | \fBdefault\fP | \fBhi-res\fP | \fBfile=\fPinputfile | \fBhelp\fP
-+.BR -K|--custom-quant-matrices \fBkvcd\fP | \fBtmpgenc\fP |
-+ \fBdefault\fP | \fBhi-res\fP | \fBfile=\fPinputfile | \fBhelp\fP
- .PP
- Specify which quantisation matrices to use instead of the defaults
- (which can be specified by using "-K default").   Using "-K hi-res" is
-diff -Nur mjpegtools-1.9.0rc3/docs/mplex.1 mjpegtools-1.9.0rc3.new/docs/mplex.1
---- mjpegtools-1.9.0rc3/docs/mplex.1
-+++ mjpegtools-1.9.0rc3.new/docs/mplex.1
-@@ -129,7 +129,7 @@
- .br
- [,
- .I samples_per_sec:channels:bits_per_sample
--...]
-+ ...]
- .br
- A comma-seperated list of paramter sets for the lpcm audio streams
- (given in the order the lpcm streams appear on the command line).

-- 
mjpegtools packaging