[SCM] lives packaging branch, master, updated. debian/1.1.8-2-3-g22c109f

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

The following commit has been merged in the master branch:
commit 22c109fefe65c763f6182345d63550e657b096dc
Author: Harry Rickards <harry at linux.com>
Date:   Wed Jan 13 19:28:23 2010 +0000

    Updated lives manpage to include options
    Taken options from LiVES manual  - http://lives.sourceforge.net/manual/LiVES_manual.html#section3.1

diff --git a/debian/lives.1 b/debian/lives.1
index 7b0edff..3aea297 100644
--- a/debian/lives.1
+++ b/debian/lives.1
@@ -3,6 +3,10 @@
 LiVES \- LiVES is a Video Editing System
 .SH SYNOPSIS
 .B lives
+<video_file> <start_time> <frames> [ -help ] [ -version ]
+[ -set setname | -noset ] [ -nogui ] [ -aplayer ap ] [ -jackopts opts ]
+[ -norecover | -recover ] [ -oscstart port | -nooscstart ]
+[ -devicemap mapfile ]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B lives
@@ -11,6 +15,47 @@ command.
 \fBLiVES\fP  lets you start editing and making video right away, without having
 to worry about formats, frame sizes, or framerates. LiVES will let you start
 creating your own tools, utilities and effects via the built in RFX builder.
+.SH OPTIONS
+\-help
+Show all commandline options and exit
+.TP
+\-version
+Print the version, copyright and licensing details, and exit
+.TP
+\-set setname
+Start up lives and autoload set setname
+.TP
+\-noset
+Do not load any set on startup
+.TP
+\-nogui
+Do not show the GUI (experimental)
+.TP
+\-aplayer ap
+Start with selected audio player. ap can be mplayer, sox or jack.
+Note: This sets the audio player permanently. You can change it in preferences.
+.TP
+\-jackopts opts
+opts is a bitmap of jack startup options [1 = jack transport client, 2 = jack
+transport master, 4 = start jack transport server, 8 = pause audio when video
+paused, 16 = start jack audio server] 
+Note: jackopts are temporary, only for this instance. You need to set them in
+Preferences if you want to make permanent changes. 
+.TP
+\-norecover
+Force no loading of crash recovery
+.TP
+\-recover
+Force loading of crash recovery (if present)
+.TP
+\-oscstart port
+Start OSC listener on UDP port port if LiVES is compiled with OSC support
+.TP
+\-nooscstart
+Do not start OSC listener
+.TP
+\-devicemap mapfile
+Load in device mapping file mapfile at startup
 .SH SEE ALSO
 .BR mplayer (1),
 .BR ImageMagick (1),
@@ -19,5 +64,7 @@ creating your own tools, utilities and effects via the built in RFX builder.
 .SH AUTHOR
 lives was written by Gabriel "Salsaman" Finch.
 .PP
-This manual page was written by G\[:u]rkan Seng\[:u]n <gurkan at phys.ethz.ch>,
-for the Debian project (but may be used by others).
+This manual page was originally written by G\[:u]rkan Seng\[:u]n
+<gurkan at phys.ethz.ch>, for the Debian project (but may be used by others).
+This man page has been updated by Gabriel "Salsaman" Finch <salsaman at xs4all.nl>
+and Harry Rickards <harry at linux.com>

-- 
lives packaging