[Libreoffice-commits] .: 2 commits - bin/package-ooo bin/piece man/libreoffice.1.in man/Makefile.am man/openoffice.1.in

Caolán McNamara caolan at kemper.freedesktop.org
Tue Dec 21 06:18:47 PST 2010 

 bin/package-ooo               |    8 -
 bin/piece/desktop-support-app |    2 
 man/Makefile.am               |    2 
 man/libreoffice.1.in          |  246 ++++++++++++++++++++++++++++++++++++++++++
 man/openoffice.1.in           |  166 ----------------------------
 5 files changed, 252 insertions(+), 172 deletions(-)

New commits:
commit 5f1fc8dca9be968dbb116458ac74cf39bd107260
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 21 14:18:39 2010 +0000

    and adjust for renamed man page

diff --git a/bin/package-ooo b/bin/package-ooo
index e4ae2b2..a54c6ab 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -121,11 +121,11 @@ $TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/ba
 if test "z$VENDORNAME" != "zRedHat"; then
 	mkdir -p $MANDIR/man1
 	echo "Generating man pages ...";
-	# openoffice
-	man_page_in=$TOOLSDIR/man/openoffice.1.in
+	# libreoffice
+	man_page_in=$TOOLSDIR/man/libreoffice.1.in
 	# use the distro specific man page if available
-	if test -f $TOOLSDIR/man/openoffice.1_${DISTRO%%-*}.in ; then
-	    man_page_in=$TOOLSDIR/man/openoffice.1_${DISTRO%%-*}.in
+	if test -f $TOOLSDIR/man/libreoffice.1_${DISTRO%%-*}.in ; then
+	    man_page_in=$TOOLSDIR/man/libreoffice.1_${DISTRO%%-*}.in
 	fi
 	sed -e "s|@BINSUFFIX@|$BINSUFFIX|g" $man_page_in \
 		>| "$MANDIR/man1/openoffice$BINSUFFIX.1" || exit 1;
diff --git a/bin/piece/desktop-support-app b/bin/piece/desktop-support-app
index 0f0293c..88feb28 100755
--- a/bin/piece/desktop-support-app
+++ b/bin/piece/desktop-support-app
@@ -26,7 +26,7 @@ EOT
 create_man_link()
 {
     mkdir -p $DESTDIR$OO_MANDIR/man1
-    echo ".so man1/openoffice.1" >| $DESTDIR$OO_MANDIR/man1/$1.1
+    echo ".so man1/libreoffice.1" >| $DESTDIR$OO_MANDIR/man1/$1.1
     gzip $DESTDIR$OO_MANDIR/man1/$1.1
     test -n "$DESTDIR" && echo "$OO_MANDIR/man1/$1.1.gz" >>files-$piece.txt
 }
diff --git a/man/Makefile.am b/man/Makefile.am
index bde51f1..e73b46b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST=openoffice.1.in unopkg.1.in
+EXTRA_DIST=libreoffice.1.in unopkg.1.in
diff --git a/man/openoffice.1.in b/man/openoffice.1.in
deleted file mode 100644
index d0af4d0..0000000
--- a/man/openoffice.1.in
+++ /dev/null
@@ -1,166 +0,0 @@
-.TH ooffice "1" "2008-11-19" "OpenOffice.org" "User Commands"
-.SH "Name"
-ooffice at BINSUFFIX@ \- OpenOffice.org office suite
-.SH SYNOPSIS
-.B ooffice at BINSUFFIX@
-[\fB\-accept\=\fIaccept\-string\fR] [\fB\-base\fR] [\fB\-calc\fR]
-[\fB\-display \fIdisplay\fR] [\fB\-draw\fR] [\fB\-global\fR] [\fB\-headless\fR]
-[\fB\-help\fR|\fB\-h\fR|\fB\-?\fR] [\fB\-impress\fR] [\fB\-invisible\fR]
-[\fB\-math\fR] [\fB\-minimized\fR] [\fB\-n \fIfilename\fR] [\fB\-nodefault\fR]
-[\fB\-nolockcheck\fR] [\fB\-nologo\fR] [\fB\-norestore\fR]
-[\fB\-o \fIfilename\fR] [\fB\-p \fIfilename\fR...]
-[\fB\-pt \fIprintername\fR \fIfilename\fR...]
-[\fB\-show \fIpresentation\fR] [\fB\-unaccept=\fIaccept\-string\fR]
-[\fB\-terminate_after_init\fR] [\fB\-view \fIfilename\fR] [\fB\-web\fR]
-[\fB\-writer\fR]  [\fIfilename\fR...]
-.br
-.B oobase at BINSUFFIX@
-.br
-.B oocalc at BINSUFFIX@
-.br
-.B oodraw at BINSUFFIX@
-.br
-.B oofromtemplate at BINSUFFIX@
-.br
-.B ooimpress at BINSUFFIX@
-.br
-.B oomath at BINSUFFIX@
-.br
-.B ooweb at BINSUFFIX@
-.br
-.B oowriter at BINSUFFIX@
-.br
-
-.SH DESCRIPTION
-OpenOffice.org is a fully featured office suite for the daily use with all
-features you would normally expect in a office suite.
-
-This script runs OpenOffice with the arguments <args> given on the command line.
-
-There are also some wrapper scripts in /usr/bin which run the wanted
-OpenOffice.org module.
-
-.SH OPTIONS
-\fIfilename\fR...
-Files to operate on. Opening them is the default behavior, which can be
-influenced by command line arguments. \fB\-p\fR will print the files instead.
-.TP
-\fB\-accept=\fIaccept\-string\fR
-Notifies the OpenOffice.org software that upon the creation of "UNO Acceptor
-Threads", a "UNO Accept String" will be used.
-.TP
-\fB\-base\fR
-Starts with the database wizard.
-.TP
-\fB\-calc\fR
-Starts with an empty Calc document.
-.TP
-\fB\-display \fIdisplay\fR
-This option specifies the X server to contact; see \fBX\fR(7)
-.TP
-\fB\-draw\fR
-Starts with an empty Draw document.
-.TP
-\fB\-global\fR
-Starts with an empty Global document.
-.TP
-\fB\-headless\fR
-Starts in "headless mode", which allows using the application without user
-interface.
-
-This special mode can be used when the application is controlled by external
-clients via the API.
-.TP
-\fB\-help\fR|\fB\-h\fR|\fB\-?\fR
-Lists the available OOo\-native command line parameters to the console.
-.TP
-\fB\-impress\fR
-Starts with an empty Impress document.
-.TP
-\fB\-invisible\fR
-Starts in invisible mode.
-
-Neither the start\-up logo nor the initial program window will be visible.
-However, the OpenOffice.org software can be controlled and documents and
-dialogs opened via the API.
-
-When the OpenOffice.org software has been started with this parameter, it can
-only be ended using the taskmanager (Windows) or the kill command
-(UNIX based systems).
-
-It cannot be used in conjunction with \-quickstart.
-.TP
-\fB\-math\fR
-Starts with an empty Math document.
-.TP
-\fB\-minimized\fR
-Keep the splash screen minimized.
-.TP
-\fB\-n \fIfilename\fR
-Creates a new document using \fIfilename\fR as a template.
-.TP
-\fB\-nodefault\fR
-Starts the application without any window opened for the first time.
-A window appears if you start the office next time.
-
-It is used together with the option \fB\-nologo\fR by quickstarters. Note that
-the option \fB\-quickstart\fR has not been longer supported since
-OpenOffice.org 2.0.0.
-.TP
-\fB\-nolockcheck\fR
-Disables the check for remote instances using the installation.
-.TP
-\fB\-nologo\fR
-Disables the splash screen at program start.
-.TP
-\fB\-norestore\fR
-Disables restart and file recovery after a system crash. It is possible OOo
-will try to restore a file it keeps crashing on, if that happens \fB\-norestore\fR
-is the only way to start OOo.
-.TP
-\fB\-o \fIfilename\fR
-Opens \fIfilename\fR for editing, even if it is a template.
-.TP
-\fB\-p \fIfilename\fR...
-Prints the given files to the default printer and ends. The splash screen
-does not appear.
-
-If the file name contains spaces, then it must be enclosed in quotation marks.
-.TP
-\fB\-pt \fIprintername\fR \fIfilename\fR...
-Prints the given files to the printer \fIprintername\fR and ends. The splash
-screen does not appear.
-
-If the file name contains spaces, then it must be enclosed in quotation marks.
-.TP
-\fB\-show \fIpresentation\fR
-Starts with the given Impress file and starts the presentation. Enters edit
-mode after the presentation.
-.TP
-\fB\-unaccept=\fIaccept\-string\fR
-Closes an acceptor that was created with \fB\-accept\fR option.
-
-Use \fB\-unaccept\fR=\fIall\fR to close all open acceptors.
-.TP
-\fB\-terminate_after_init\fR
-The office terminates after it registers some UNO services. The office
-doesn't show the intro bitmap during startup.
-.TP
-\fB\-view \fIfilename\fR
-Creates a temporary copy of the given file and opens it read\-only.
-.TP
-\fB\-web\fR
-Starts with an empty HTML document.
-.TP
-\fB\-writer\fR
-Starts with an empty Writer document.
-
-.SH TROUBLESHOOTING PROBLEMS
-See \fBhttp://en.opensuse.org/Bugs:OOo\fR for more details about how to report
-bugs in OpenOffice.org.
-.SH SEE ALSO
-.BR http://go\-oo.org/
-.SH AUTHOR
-This manual page was created by Rene Engelhard <rene at debian.org> for
-the Debian GNU/Linux Distribution, because the original package does not have
-one. It was updated for Novell by Petr Mladek <petr.mladek at novell.com>.
commit 4279b57baed61ed58995f54547a9f687dfa865fd
Author: Philipp Weissenbacher <p.weissenbacher at gmail.com>
Date:   Tue Dec 21 14:17:59 2010 +0000

    Improved man page

diff --git a/man/libreoffice.1.in b/man/libreoffice.1.in
new file mode 100644
index 0000000..d406e97
--- /dev/null
+++ b/man/libreoffice.1.in
@@ -0,0 +1,246 @@
+.TH libreoffice "1" "2010-12-18" "LibreOffice" "User Commands"
+.SH Name
+libreoffice at BINSUFFIX@ \- LibreOffice office suite
+
+.SH SYNOPSIS
+.B libreoffice at BINSUFFIX@
+[\fB\-accept\=\fIaccept\-string\fR] [\fB\-base\fR] [\fB\-calc\fR]
+[\fB\-convert\-to\fR output_file_extension[:output_filter_name] [\-outdir output_dir] \fIfile\fR]...
+[\fB\-display \fIdisplay\fR] [\fB\-draw\fR] [\fB\-global\fR] [\fB\-headless\fR]
+[\fB\-help\fR|\fB\-h\fR|\fB\-?\fR] [\fB\-impress\fR] [\fB\-invisible\fR] [\fB\-infilter="<filter>"\fR]
+[\fB\-math\fR] [\fB\-minimized\fR] [\fB\-n \fIfile\fR]... [\fB\-nodefault\fR]
+[\fB\-nolockcheck\fR] [\fB\-nologo\fR] [\fB\-norestore\fR]
+[\fB\-o \fIfile\fR]... [\fB\-p \fIfile\fR...]
+[\fB\-print\-to\-file [\-printer\-name printer_name] [\-outdir output_dir] file]...
+[\fB\-pt \fIprintername\fR \fIfile\fR...]
+[\fB\-show \fIImpress file\fR]... [\fB\-unaccept=\fIaccept\-string\fR]
+[\fB\-terminate_after_init\fR] [\fB\-view \fIfile\fR]... [\fB\-web\fR]
+[\fB\-writer\fR]  [\fIfile\fR...]
+.br
+.B oobase at BINSUFFIX@
+.br
+.B oocalc at BINSUFFIX@
+.br
+.B oodraw at BINSUFFIX@
+.br
+.B oofromtemplate at BINSUFFIX@
+.br
+.B ooimpress at BINSUFFIX@
+.br
+.B oomath at BINSUFFIX@
+.br
+.B ooweb at BINSUFFIX@
+.br
+.B oowriter at BINSUFFIX@
+.br
+
+.SH DESCRIPTION
+LibreOffice (LO for short) is a multi-platform office productivity suite.
+It was derived from OpenOffice.org 3.3 Beta on September 28, 2010.
+
+\fBlibreoffice\fR is a shell script that sets up the environment and
+passes the command line arguments to the \fBsoffice.bin\fR binary.
+
+Alternatively, the following helper scripts start the respective module:
+
+sbase, scalc, sdraw, simpress, smath, sofficerc, spadmin, swriter
+
+.SH OPTIONS
+.TP
+\fB\-accept=\fIaccept\-string\fR
+Specify a UNO connect-string to create a UNO acceptor through which other
+programs can connect to access the API.
+
+.TP
+\fB\-base\fR
+Starts the wizard for a new Base document.
+
+.TP
+\fB\-calc\fR
+Starts with a new Calc document.
+
+.TP
+\fB\-convert\-to\fR output_file_extension[:output_filter_name] [\-outdir output_dir] \fIfile\fR...
+Batch converts files.
+If \fI-outdir\fR is not specified then the current working directory is used as the output directory
+for the converted files.
+
+Examples:
+
+\fB\-convert\-to\fR pdf *.doc
+
+Converts all .doc files to PDFs.
+
+\fB\-convert\-to\fR pdf:writer_pdf_Export \-outdir /home/user *.doc
+
+Converts all .doc files to PDFs using the settings in the Writer PDF export dialog and saving them
+in /home/user.
+
+.TP
+\fB\-display \fIdisplay\fR
+This option specifies the X server to use; see \fBX\fR(7)
+
+.TP
+\fB\-draw\fR
+Starts with a new Draw document.
+
+.TP
+\fB\-global\fR
+Starts with a new Global document.
+
+.TP
+\fB\-headless\fR
+Starts in "headless mode", which allows using the application without user a
+interface.
+
+This special mode can be used when the application is controlled by external
+clients via the API.
+
+It implies \-invisible and strictly ignores any GUI environment.
+\-quickstart does not work with this parameter.
+
+.TP
+\fB\-help\fR|\fB\-h\fR|\fB\-?\fR
+Lists LibreOffice command line parameters.
+
+.TP
+\fB\-impress\fR
+Starts with a new Impress document.
+
+.TP
+\fB\-invisible\fR
+Starts in invisible mode.
+
+Neither the start\-up logo nor the initial program window will be visible.
+LO can be controlled and documents and dialogs can be opened via the API.
+
+When started with this parameter, it can only be quit using the taskmanager (Windows)
+or the kill command (UNIX based systems).
+
+\-quickstart does not work with this parameter.
+
+.TP
+\fB\-infilter="<filter>"\fR
+Force an input filter type if possible.
+For example -infilter="Calc Office Open XML" only 
+
+.TP
+\fB\-math\fR
+Starts with a new Math document.
+
+.TP
+\fB\-minimized\fR
+Keeps the splash screen minimized.
+
+.TP
+\fB\-n \fItemplate\fR...
+Creates the a new document from the given templates.
+
+.TP
+\fB\-nodefault\fR
+Starts LO without creating an new document.
+The next time you start LO, the welcome screen is show.
+
+It's used together with \fB\-nologo\fR by quick starters. Note that \fB\-quickstart\fR
+has no longer been supported since OpenOffice.org 2.0.0.
+
+.TP
+\fB\-nolockcheck\fR
+Disables the check for remote instances using the installation.
+
+.TP
+\fB\-nologo\fR
+Disables the splash screen at program start.
+
+.TP
+\fB\-norestore\fR
+Disables restart and file recovery after a system crash. It is possible that LO
+will try to restore a file it keeps crashing on, if that happens \fB\-norestore\fR
+is the only way to start LO.
+
+.TP
+\fB\-nosplash\fR
+Disables the splash screen at program start.
+
+.TP
+\fB\-o \fIfile\fR...
+Opens the given files for editing, even templates.
+
+Without \fb\-o\fR a template file would create a new document derived from that template.
+
+.TP
+\fB\-p \fIfile\fR...
+Prints the given files to the default printer and ends. The splash screen
+does not appear.
+
+If the file name contains spaces, then it must be enclosed in quotation marks.
+
+.TP
+\fB\-print\-to\-file [\-printer\-name printer_name] [\-outdir output_dir] file...
+Batch print files to file.
+If \-printer\-name is not specified the default printer is used.
+If \-outdir is not specified then the current working directory is used as the output directory
+for the converted files.
+
+Examples:
+
+\-print\-to\-file *.doc
+
+Prints all .doc files to the current working directory using the default printer.
+
+\-print\-to\-file \-printer\-name nasty_lowres_printer \-outdir /home/user *.doc
+
+Prints all .doc files to /home/user directory using the nasty_lowres_printer.
+
+.TP
+\fB\-pt \fIprintername\fR \fIfile\fR...
+Prints the given files to the printer \fIprintername\fR and ends. The splash
+screen does not appear.
+
+If a file name contains spaces, then it must be enclosed in quotation marks.
+
+.TP
+\fB\-quickstart \fB\-quickstart=no
+Starts LO with it's quick starter.
+\fB\-quickstart disable the quick starter.
+
+Does not work with \-invisible or \-headless.
+
+.TP
+\fB\-show \fIImpress file\fR...
+Opens the given Impress files, starts the presentation and quits after they have finished.
+
+.TP
+\fB\-unaccept=\fIaccept\-string\fR
+Closes an acceptor that was created with \fB\-accept\fR option.
+
+Use \fB\-unaccept\fR=\fIall\fR to close all open acceptors.
+
+.TP
+\fB\-terminate_after_init\fR
+Starts LO and terminates after it registers some UNO services.
+Doesn't show the splash during startup.
+
+.TP
+\fB\-view \fIfile\fR...
+Opens the given files read-only creating a temporary copy of them at $TMPDIR.
+
+.TP
+\fB\-web\fR
+Starts with a new HTML document.
+
+.TP
+\fB\-writer\fR
+Starts with a new Writer document.
+
+.SH TROUBLESHOOTING PROBLEMS
+See \fBhttp://wiki.documentfoundation.org/BugReport\fR for more details on how to report
+bugs in LibreOffice.
+.SH SEE ALSO
+.BR http://www.documentfoundation.org/
+
+.SH AUTHOR
+This manual page was created by Rene Engelhard <rene at debian.org> for
+the Debian GNU/Linux Distribution, because the original package does not have
+one. It was updated for Novell by Petr Mladek <petr.mladek at novell.com> and
+adapted for LibreOffice by Philipp Weissenbacher <philipp.weissenbacher at gmail.com>.

More information about the Libreoffice-commits mailing list