[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-4-20-g5b75815
The following commit has been merged in the master branch:
commit 5b75815566494001da677c0a3cb84cd2dbf6a898
Author: Rene Engelhard <rene@debian.org>
Date: Mon Nov 7 23:24:16 2011 +0100
update libreoffice.1 for new long parameters (closes: #646800)
diff --git a/changelog b/changelog
index dcf4d70..66fbb44 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,8 @@ libreoffice (1:3.4.4~rc2-1) UNRELEASED; urgency=low
RFC/I-Ds (closes: #645753)
* debian/patches/update-sdbc-postgresql.diff: update to 0.8.1
+ * debian/patches/update-libreoffice.1.diff: update libreoffice.1 for
+ new long parameters (closes: #646800)
* debian/rules:
- don't try to use internal jfreereport on ia64; disable the SRB
@@ -19,8 +21,8 @@ libreoffice (1:3.4.4~rc2-1) UNRELEASED; urgency=low
- also add icon version to debian menus (closes: #645953)
* debian/control.in:
- remove suggests on menu (closes: #647371)
-
- -- Rene Engelhard <rene@debian.org> Wed, 02 Nov 2011 11:51:22 +0100
+
+ -- Rene Engelhard <rene@debian.org> Mon, 07 Nov 2011 23:21:51 +0100
libreoffice (1:3.4.3-4) unstable; urgency=low
diff --git a/patches/series b/patches/series
index 9579bc3..44297b8 100644
--- a/patches/series
+++ b/patches/series
@@ -22,3 +22,4 @@ no-deprecated-options-in-qstart-wrappers.diff
update-sdbc-postgresql.diff
jdk-1.7.0-vendorname.diff
s390x.diff
+update-libreoffice.1.diff
diff --git a/patches/update-libreoffice.1.diff b/patches/update-libreoffice.1.diff
new file mode 100644
index 0000000..d154c2f
--- /dev/null
+++ b/patches/update-libreoffice.1.diff
@@ -0,0 +1,251 @@
+--- libreoffice-3.4.4/libreoffice-build/man/libreoffice.1.in-old 2011-11-07 21:06:51.000000000 +0100
++++ libreoffice-3.4.4/libreoffice-build/man/libreoffice.1.in 2011-11-07 23:20:07.000000000 +0100
+@@ -4,18 +4,18 @@
+
+ .SH SYNOPSIS
+ .B libreoffice@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\-\-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...]
++[\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@BINSUFFIX@
+ .br
+@@ -47,68 +47,68 @@
+
+ .SH OPTIONS
+ .TP
+-\fB\-accept=\fIaccept\-string\fR
++\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
++\fB\-\-base\fR
+ Starts the wizard for a new Base document.
+
+ .TP
+-\fB\-calc\fR
++\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...
++\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
++\fB\-\-convert\-to\fR pdf *.doc
+
+ Converts all .doc files to PDFs.
+
+-\fB\-convert\-to\fR pdf:writer_pdf_Export \-outdir /home/user *.doc
++\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
++\fB\-\-display \fIdisplay\fR
+ This option specifies the X server to use; see \fBX\fR(7)
+
+ .TP
+-\fB\-draw\fR
++\fB\-\-draw\fR
+ Starts with a new Draw document.
+
+ .TP
+-\fB\-global\fR
++\fB\-\-global\fR
+ Starts with a new Global document.
+
+ .TP
+-\fB\-headless\fR
++\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.
++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
++\fB\-\-help\fR|\fB\-h\fR|\fB\-?\fR
+ Lists LibreOffice command line parameters.
+
+ .TP
+-\fB\-impress\fR
++\fB\-\-impress\fR
+ Starts with a new Impress document.
+
+ .TP
+-\fB\-invisible\fR
++\fB\-\-invisible\fR
+ Starts in invisible mode.
+
+ Neither the start\-up logo nor the initial program window will be visible.
+@@ -117,19 +117,19 @@
+ 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.
++\-\-quickstart does not work with this parameter.
+
+ .TP
+-\fB\-infilter="<filter>"\fR
++\fB\-\-infilter="<filter>"\fR
+ Force an input filter type if possible.
+ For example -infilter="Calc Office Open XML" only
+
+ .TP
+-\fB\-math\fR
++\fB\-\-math\fR
+ Starts with a new Math document.
+
+ .TP
+-\fB\-minimized\fR
++\fB\-\-minimized\fR
+ Keeps the splash screen minimized.
+
+ .TP
+@@ -137,7 +137,7 @@
+ Creates the a new document from the given templates.
+
+ .TP
+-\fB\-nodefault\fR
++\fB\-\-nodefault\fR
+ Starts LO without creating an new document.
+ The next time you start LO, the welcome screen is show.
+
+@@ -145,21 +145,21 @@
+ has no longer been supported since OpenOffice.org 2.0.0.
+
+ .TP
+-\fB\-nolockcheck\fR
++\fB\-\-nolockcheck\fR
+ Disables the check for remote instances using the installation.
+
+ .TP
+-\fB\-nologo\fR
++\fB\-\-nologo\fR
+ Disables the splash screen at program start.
+
+ .TP
+-\fB\-norestore\fR
++\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
++\fB\-\-nosplash\fR
+ Disables the splash screen at program start.
+
+ .TP
+@@ -176,7 +176,7 @@
+ 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...
++\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
+@@ -184,53 +184,53 @@
+
+ Examples:
+
+-\-print\-to\-file *.doc
++\-\-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
++\-\-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...
++\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
++\fB\-\-quickstart \fB\-quickstart=no
+ Starts LO with it's quick starter.
+-\fB\-quickstart disable the quick starter.
++\fB\-\-quickstart disable the quick starter.
+
+-Does not work with \-invisible or \-headless.
++Does not work with \-\-invisible or \-\-headless.
+
+ .TP
+-\fB\-show \fIImpress file\fR...
++\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
++\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.
++Use \fB\-\-unaccept\fR=\fIall\fR to close all open acceptors.
+
+ .TP
+-\fB\-terminate_after_init\fR
++\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...
++\fB\-\-view \fIfile\fR...
+ Opens the given files read-only creating a temporary copy of them at $TMPDIR.
+
+ .TP
+-\fB\-web\fR
++\fB\-\-web\fR
+ Starts with a new HTML document.
+
+ .TP
+-\fB\-writer\fR
++\fB\-\-writer\fR
+ Starts with a new Writer document.
+
+ .SH TROUBLESHOOTING PROBLEMS
--
LibreOffice packaging repository
Reply to: