Package: libreoffice
Version: 1:3.4.1-1
Severity: minor
Tags: patch

Hi!

I saw this when calling "libreoffice -writer":

Warning: -writer is deprecated.  Use --writer instead.

Attached is a patch (I hope it's correct) that fix these
deprecated options for the menu and mime files.

Thank you!

Best regards,
Nelson

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (100, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=pt_BR.utf8, LC_CTYPE=pt_BR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From 102955fba3ac5a30fecaaf6f922710c4632f212b Mon Sep 17 00:00:00 2001
From: "Nelson A. de Oliveira" <nao...@debian.org>
Date: Fri, 15 Jul 2011 16:32:15 -0300
Subject: [PATCH] Fix deprecated options when calling soffice and libreoffice

---
 libreoffice-base.menu.in          |    3 +--
 libreoffice-base.mime             |    4 ++--
 libreoffice-calc.menu.in          |    3 +--
 libreoffice-calc.mime             |   30 +++++++++++++++---------------
 libreoffice-draw.menu.in          |    3 +--
 libreoffice-draw.mime             |    8 ++++----
 libreoffice-filter-binfilter.mime |   14 +++++++-------
 libreoffice-impress.menu.in       |    3 +--
 libreoffice-impress.mime          |   22 +++++++++++-----------
 libreoffice-math.menu.in          |    3 +--
 libreoffice-math.mime             |    6 +++---
 libreoffice-writer.menu.in        |    3 +--
 libreoffice-writer.mime           |   34 +++++++++++++++++-----------------
 13 files changed, 65 insertions(+), 71 deletions(-)

diff --git a/libreoffice-base.menu.in b/libreoffice-base.menu.in
index fbea26c..6a2f4c4 100644
--- a/libreoffice-base.menu.in
+++ b/libreoffice-base.menu.in
@@ -1,5 +1,4 @@
 ?package(libreoffice-base):needs="X11" section="Applications/Data Management" \
-  title="LibreOffice Base" command="/usr/bin/libreoffice -base"\
+  title="LibreOffice Base" command="/usr/bin/libreoffice --base"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-base.xpm"
-
diff --git a/libreoffice-base.mime b/libreoffice-base.mime
index cf3cef7..9eb7cfd 100644
--- a/libreoffice-base.mime
+++ b/libreoffice-base.mime
@@ -2,10 +2,10 @@
 # shared-mime-info
 
 # OASIS OpenDocument Format
-application/vnd.oasis.opendocument.database; soffice -no-oosplash -base '%s'; 
edit=soffice -no-oosplash -base '%s'; print=soffice -no-oosplash -base -p '%s'; 
test=test -n "$DISPLAY"; description="OpenDocument Database"; 
nametemplate=%s.odb; priority=9
+application/vnd.oasis.opendocument.database; soffice -no-oosplash --base '%s'; 
edit=soffice -no-oosplash --base '%s'; print=soffice -no-oosplash --base -p 
'%s'; test=test -n "$DISPLAY"; description="OpenDocument Database"; 
nametemplate=%s.odb; priority=9
 
 # OpenOffice.org 1.0
-application/vnd.sun.xml.base; soffice -no-oosplash -writer '%s'; edit=soffice 
-no-oosplash -writer '%s'; description="OpenOffice.org Database"; 
nametemplate=%s.sdb; priority=8
+application/vnd.sun.xml.base; soffice -no-oosplash --writer '%s'; edit=soffice 
-no-oosplash --writer '%s'; description="OpenOffice.org Database"; 
nametemplate=%s.sdb; priority=8
 
 #
 ###
diff --git a/libreoffice-calc.menu.in b/libreoffice-calc.menu.in
index 00bf4fc..3927362 100644
--- a/libreoffice-calc.menu.in
+++ b/libreoffice-calc.menu.in
@@ -1,6 +1,5 @@
 ?package(libreoffice-calc):needs="X11" section="Applications/Office"\
-  title="LibreOffice Calc" command="/usr/bin/libreoffice -calc"\
+  title="LibreOffice Calc" command="/usr/bin/libreoffice --calc"\
   hints="Spreadsheets"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-calc.xpm"
-
diff --git a/libreoffice-calc.mime b/libreoffice-calc.mime
index 2fd78cd..d182907 100644
--- a/libreoffice-calc.mime
+++ b/libreoffice-calc.mime
@@ -2,35 +2,35 @@
 # shared-mime-info
 
 # Generic
-text/csv; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc 
'%s'; test=test -n "$DISPLAY"; description="CSV Document"; nametemplate=%s.csv; 
priority=3
-text/spreadsheet; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash 
-calc '%s'; test=test -n "$DISPLAY"; description="Spreadsheet Interchange 
Document"; nametemplate=%s.slk; priority=3
+text/csv; soffice -no-oosplash --calc '%s'; edit=soffice -no-oosplash --calc 
'%s'; test=test -n "$DISPLAY"; description="CSV Document"; nametemplate=%s.csv; 
priority=3
+text/spreadsheet; soffice -no-oosplash --calc '%s'; edit=soffice -no-oosplash 
--calc '%s'; test=test -n "$DISPLAY"; description="Spreadsheet Interchange 
Document"; nametemplate=%s.slk; priority=3
 
 # Corel Quattro Pro
-application/x-quattropro; soffice -no-oosplash -calc '%s'; edit=soffice 
-no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="Quattro Pro 6 
for Windows Spreadsheet"; nametemplate=%s.wb2; priority=3
+application/x-quattropro; soffice -no-oosplash --calc '%s'; edit=soffice 
-no-oosplash --calc '%s'; test=test -n "$DISPLAY"; description="Quattro Pro 6 
for Windows Spreadsheet"; nametemplate=%s.wb2; priority=3
 
 # dBase dBASE
-application/x-dbf; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash 
-calc '%s'; test=test -n "$DISPLAY"; description="xBase Document"; 
nametemplate=%s.dbf; priority=3
+application/x-dbf; soffice -no-oosplash --calc '%s'; edit=soffice -no-oosplash 
--calc '%s'; test=test -n "$DISPLAY"; description="xBase Document"; 
nametemplate=%s.dbf; priority=3
 
 # ECMA Office Open XML (Microsoft Office 2007)
-application/vnd.ms-excel.sheet.macroEnabled.12; soffice -no-oosplash -calc 
'%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; 
description="Office Open XML Spreadsheet with Macros Enabled"; 
nametemplate=%s.xlsm; priority=3
-application/vnd.ms-excel.template.macroEnabled.12; soffice -no-oosplash -calc 
'%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; 
description="Office Open XML Spreadsheet Template with Macros Enabled"; 
nametemplate=%s.xltm; priority=3
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; soffice 
-no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n 
"$DISPLAY"; description="Office Open XML Spreadsheet"; nametemplate=%s.xlsx; 
priority=3
-application/vnd.openxmlformats-officedocument.spreadsheetml.template; soffice 
-no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n 
"$DISPLAY"; description="Office Open XML Spreadsheet Template"; 
nametemplate=%s.xltx; priority=3
+application/vnd.ms-excel.sheet.macroEnabled.12; soffice -no-oosplash --calc 
'%s'; edit=soffice -no-oosplash --calc '%s'; test=test -n "$DISPLAY"; 
description="Office Open XML Spreadsheet with Macros Enabled"; 
nametemplate=%s.xlsm; priority=3
+application/vnd.ms-excel.template.macroEnabled.12; soffice -no-oosplash --calc 
'%s'; edit=soffice -no-oosplash --calc '%s'; test=test -n "$DISPLAY"; 
description="Office Open XML Spreadsheet Template with Macros Enabled"; 
nametemplate=%s.xltm; priority=3
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; soffice 
-no-oosplash --calc '%s'; edit=soffice -no-oosplash --calc '%s'; test=test -n 
"$DISPLAY"; description="Office Open XML Spreadsheet"; nametemplate=%s.xlsx; 
priority=3
+application/vnd.openxmlformats-officedocument.spreadsheetml.template; soffice 
-no-oosplash --calc '%s'; edit=soffice -no-oosplash --calc '%s'; test=test -n 
"$DISPLAY"; description="Office Open XML Spreadsheet Template"; 
nametemplate=%s.xltx; priority=3
 
 # IBM Lotus 1-2-3
-application/vnd.lotus-1-2-3; soffice -no-oosplash -calc '%s'; edit=soffice 
-no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="Lotus 1-2-3 
spreadsheet"; nametemplate=%s.123; priority=3
+application/vnd.lotus-1-2-3; soffice -no-oosplash --calc '%s'; edit=soffice 
-no-oosplash --calc '%s'; test=test -n "$DISPLAY"; description="Lotus 1-2-3 
spreadsheet"; nametemplate=%s.123; priority=3
 
 # Microsoft Excel
-application/vnd.ms-excel; soffice -no-oosplash -calc '%s'; edit=soffice 
-no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="Microsoft Excel 
Document"; nametemplate=%s.xls; priority=3
+application/vnd.ms-excel; soffice -no-oosplash --calc '%s'; edit=soffice 
-no-oosplash --calc '%s'; test=test -n "$DISPLAY"; description="Microsoft Excel 
Document"; nametemplate=%s.xls; priority=3
 
 # OASIS OpenDocument Format
-application/vnd.oasis.opendocument.chart; soffice -no-oosplash -calc '%s'; 
edit=soffice -no-oosplash -calc '%s'; print=soffice -no-oosplash -calc -p '%s'; 
test=test -n "$DISPLAY"; description="OpenDocument Chart"; nametemplate=%s.odc; 
priority=9
-application/vnd.oasis.opendocument.spreadsheet; soffice -no-oosplash -calc 
'%s'; edit=soffice -no-oosplash -calc '%s'; print=soffice -no-oosplash -calc -p 
'%s'; test=test -n "$DISPLAY"; description="OpenDocument Spreadsheet"; 
nametemplate=%s.ods; priority=9
-application/vnd.oasis.opendocument.spreadsheet-template; soffice -no-oosplash 
-calc '%s'; edit=soffice -no-oosplash -calc '%s'; print=soffice -no-oosplash 
-calc -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Spreadsheet 
Template"; nametemplate=%s.ots; priority=9
+application/vnd.oasis.opendocument.chart; soffice -no-oosplash --calc '%s'; 
edit=soffice -no-oosplash --calc '%s'; print=soffice -no-oosplash --calc -p 
'%s'; test=test -n "$DISPLAY"; description="OpenDocument Chart"; 
nametemplate=%s.odc; priority=9
+application/vnd.oasis.opendocument.spreadsheet; soffice -no-oosplash --calc 
'%s'; edit=soffice -no-oosplash --calc '%s'; print=soffice -no-oosplash --calc 
-p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Spreadsheet"; 
nametemplate=%s.ods; priority=9
+application/vnd.oasis.opendocument.spreadsheet-template; soffice -no-oosplash 
--calc '%s'; edit=soffice -no-oosplash --calc '%s'; print=soffice -no-oosplash 
--calc -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Spreadsheet 
Template"; nametemplate=%s.ots; priority=9
 
 # OpenOffice.org 1.0
-application/vnd.sun.xml.calc; soffice -no-oosplash -calc '%s'; edit=soffice 
-no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org 
Spreadsheet"; nametemplate=%s.sxc; priority=8
-application/vnd.sun.xml.calc.template; soffice -no-oosplash -calc '%s'; 
edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; 
description="OpenOffice.org Spreadsheet Template"; nametemplate=%s.stc; 
priority=8
+application/vnd.sun.xml.calc; soffice -no-oosplash --calc '%s'; edit=soffice 
-no-oosplash --calc '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org 
Spreadsheet"; nametemplate=%s.sxc; priority=8
+application/vnd.sun.xml.calc.template; soffice -no-oosplash --calc '%s'; 
edit=soffice -no-oosplash --calc '%s'; test=test -n "$DISPLAY"; 
description="OpenOffice.org Spreadsheet Template"; nametemplate=%s.stc; 
priority=8
 
 #
 ###
diff --git a/libreoffice-draw.menu.in b/libreoffice-draw.menu.in
index 09b24cc..4583871 100644
--- a/libreoffice-draw.menu.in
+++ b/libreoffice-draw.menu.in
@@ -1,6 +1,5 @@
 ?package(libreoffice-draw):needs="X11" section="Applications/Graphics"\
-  title="LibreOffice Draw" command="/usr/bin/libreoffice -draw"\
+  title="LibreOffice Draw" command="/usr/bin/libreoffice --draw"\
   hints="Drawing"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-draw.xpm"
-
diff --git a/libreoffice-draw.mime b/libreoffice-draw.mime
index 7f988f3..0067a65 100644
--- a/libreoffice-draw.mime
+++ b/libreoffice-draw.mime
@@ -2,12 +2,12 @@
 # shared-mime-info
 
 # OASIS OpenDocument Format
-application/vnd.oasis.opendocument.graphics; soffice -no-oosplash -draw '%s'; 
edit=soffice -no-oosplash -draw '%s'; print=soffice -no-oosplash -draw -p '%s'; 
test=test -n "$DISPLAY"; description="OpenDocument Drawing"; 
nametemplate=%s.odg; priority=9
-application/vnd.oasis.opendocument.graphics-template; soffice -no-oosplash 
-draw '%s'; edit=soffice -no-oosplash -draw '%s'; print=soffice -no-oosplash 
-draw -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Drawing 
Template"; nametemplate=%s.otg; priority=9
+application/vnd.oasis.opendocument.graphics; soffice -no-oosplash --draw '%s'; 
edit=soffice -no-oosplash --draw '%s'; print=soffice -no-oosplash --draw -p 
'%s'; test=test -n "$DISPLAY"; description="OpenDocument Drawing"; 
nametemplate=%s.odg; priority=9
+application/vnd.oasis.opendocument.graphics-template; soffice -no-oosplash 
--draw '%s'; edit=soffice -no-oosplash --draw '%s'; print=soffice -no-oosplash 
--draw -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Drawing 
Template"; nametemplate=%s.otg; priority=9
 
 # OpenOffice.org 1.0
-application/vnd.sun.xml.draw; soffice -no-oosplash -draw '%s'; edit=soffice 
-no-oosplash -draw '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org 
Drawing"; nametemplate=%s.sxd; priority=8
-application/vnd.sun.xml.draw.template; soffice -no-oosplash -draw '%s'; 
edit=soffice -no-oosplash -draw '%s'; test=test -n "$DISPLAY"; 
description="OpenOffice.org Drawing Template"; nametemplate=%s.std; priority=8
+application/vnd.sun.xml.draw; soffice -no-oosplash --draw '%s'; edit=soffice 
-no-oosplash --draw '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org 
Drawing"; nametemplate=%s.sxd; priority=8
+application/vnd.sun.xml.draw.template; soffice -no-oosplash --draw '%s'; 
edit=soffice -no-oosplash --draw '%s'; test=test -n "$DISPLAY"; 
description="OpenOffice.org Drawing Template"; nametemplate=%s.std; priority=8
 
 #
 ###
diff --git a/libreoffice-filter-binfilter.mime 
b/libreoffice-filter-binfilter.mime
index 0e71adf..ebdfbb0 100644
--- a/libreoffice-filter-binfilter.mime
+++ b/libreoffice-filter-binfilter.mime
@@ -2,13 +2,13 @@
 # shared-mime-info
 
 # StarDivision StarOffice 5.0
-application/vnd.stardivision.calc; soffice -no-oosplash -calc '%s'; 
edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; 
description="StarCalc 5.0"; nametemplate=%s.sdc; priority=8
-application/vnd.stardivision.chart; soffice -no-oosplash -calc '%s'; 
edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; 
description="StarChart 5.0"; nametemplate=%s.sds; priority=8
-application/vnd.stardivision.draw; soffice -no-oosplash -draw '%s'; 
edit=soffice -no-oosplash -draw '%s'; test=test -n "$DISPLAY"; 
description="StarDraw 5.0"; nametemplate=%s.sda; priority=8
-application/vnd.stardivision.impress; soffice -no-oosplash -impress '%s'; 
edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; 
description="StarImpress 5.0"; nametemplate=%s.sdd; priority=8
-application/vnd.stardivision.math; soffice -no-oosplash -math '%s'; 
edit=soffice -no-oosplash -math '%s'; test=test -n "$DISPLAY"; 
description="StarMath 5.0"; nametemplate=%s.sdf; priority=8
-application/vnd.stardivision.writer-global; soffice -no-oosplash -writer '%s'; 
edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; 
description="StarWriter 5.0 Master Document"; nametemplate=%s.sgl; priority=8
-application/vnd.stardivision.writer; soffice -no-oosplash -writer '%s'; 
edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; 
description="StarWriter 5.0"; nametemplate=%s.sdw; priority=8
+application/vnd.stardivision.calc; soffice -no-oosplash --calc '%s'; 
edit=soffice -no-oosplash --calc '%s'; test=test -n "$DISPLAY"; 
description="StarCalc 5.0"; nametemplate=%s.sdc; priority=8
+application/vnd.stardivision.chart; soffice -no-oosplash --calc '%s'; 
edit=soffice -no-oosplash --calc '%s'; test=test -n "$DISPLAY"; 
description="StarChart 5.0"; nametemplate=%s.sds; priority=8
+application/vnd.stardivision.draw; soffice -no-oosplash --draw '%s'; 
edit=soffice -no-oosplash --draw '%s'; test=test -n "$DISPLAY"; 
description="StarDraw 5.0"; nametemplate=%s.sda; priority=8
+application/vnd.stardivision.impress; soffice -no-oosplash --impress '%s'; 
edit=soffice -no-oosplash --impress '%s'; test=test -n "$DISPLAY"; 
description="StarImpress 5.0"; nametemplate=%s.sdd; priority=8
+application/vnd.stardivision.math; soffice -no-oosplash --math '%s'; 
edit=soffice -no-oosplash --math '%s'; test=test -n "$DISPLAY"; 
description="StarMath 5.0"; nametemplate=%s.sdf; priority=8
+application/vnd.stardivision.writer-global; soffice -no-oosplash --writer 
'%s'; edit=soffice -no-oosplash --writer '%s'; test=test -n "$DISPLAY"; 
description="StarWriter 5.0 Master Document"; nametemplate=%s.sgl; priority=8
+application/vnd.stardivision.writer; soffice -no-oosplash --writer '%s'; 
edit=soffice -no-oosplash --writer '%s'; test=test -n "$DISPLAY"; 
description="StarWriter 5.0"; nametemplate=%s.sdw; priority=8
 
 #
 ###
diff --git a/libreoffice-impress.menu.in b/libreoffice-impress.menu.in
index c09f666..d52e24a 100644
--- a/libreoffice-impress.menu.in
+++ b/libreoffice-impress.menu.in
@@ -1,6 +1,5 @@
 ?package(libreoffice-impress):needs="X11" section="Applications/Office"\
-  title="LibreOffice Impress" command="/usr/bin/libreoffice -impress"\
+  title="LibreOffice Impress" command="/usr/bin/libreoffice --impress"\
   hints="Presentation"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-impress.xpm"
-
diff --git a/libreoffice-impress.mime b/libreoffice-impress.mime
index 5548648..ee41134 100644
--- a/libreoffice-impress.mime
+++ b/libreoffice-impress.mime
@@ -2,23 +2,23 @@
 # shared-mime-info
 
 # ECMA Office Open XML (Microsoft Office 2007)
-application/vnd.ms-powerpoint.presentation.macroEnabled.12; soffice 
-no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test 
-n "$DISPLAY"; description="Office Open XML Presentation with Macros Enabled"; 
nametemplate=%s.pptm; priority=3
-application/vnd.ms-powerpoint.slideshow.macroEnabled.12; soffice -no-oosplash 
-impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n 
"$DISPLAY"; description="Office Open XML Presentation Slide Show with Macros 
Enabled"; nametemplate=%s.ppsm; priority=3
-application/vnd.ms-powerpoint.template.macroEnabled.12; soffice -no-oosplash 
-impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n 
"$DISPLAY"; description="Office Open XML Presentation Template with Macros 
Enabled"; nametemplate=%s.potm; priority=3
-application/vnd.openxmlformats-officedocument.presentationml.presentation; 
soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; 
test=test -n "$DISPLAY"; description="Office Open XML Presentation"; 
nametemplate=%s.pptx; priority=3
-application/vnd.openxmlformats-officedocument.presentationml.slideshow; 
soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; 
test=test -n "$DISPLAY"; description="Office Open XML Presentation Slide Show"; 
nametemplate=%s.ppsx; priority=3
-application/vnd.openxmlformats-officedocument.presentationml.template; soffice 
-no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test 
-n "$DISPLAY"; description="Office Open XML Presentation Template"; 
nametemplate=%s.potx; priority=3
+application/vnd.ms-powerpoint.presentation.macroEnabled.12; soffice 
-no-oosplash --impress '%s'; edit=soffice -no-oosplash --impress '%s'; 
test=test -n "$DISPLAY"; description="Office Open XML Presentation with Macros 
Enabled"; nametemplate=%s.pptm; priority=3
+application/vnd.ms-powerpoint.slideshow.macroEnabled.12; soffice -no-oosplash 
--impress '%s'; edit=soffice -no-oosplash --impress '%s'; test=test -n 
"$DISPLAY"; description="Office Open XML Presentation Slide Show with Macros 
Enabled"; nametemplate=%s.ppsm; priority=3
+application/vnd.ms-powerpoint.template.macroEnabled.12; soffice -no-oosplash 
--impress '%s'; edit=soffice -no-oosplash --impress '%s'; test=test -n 
"$DISPLAY"; description="Office Open XML Presentation Template with Macros 
Enabled"; nametemplate=%s.potm; priority=3
+application/vnd.openxmlformats-officedocument.presentationml.presentation; 
soffice -no-oosplash --impress '%s'; edit=soffice -no-oosplash --impress '%s'; 
test=test -n "$DISPLAY"; description="Office Open XML Presentation"; 
nametemplate=%s.pptx; priority=3
+application/vnd.openxmlformats-officedocument.presentationml.slideshow; 
soffice -no-oosplash --impress '%s'; edit=soffice -no-oosplash --impress '%s'; 
test=test -n "$DISPLAY"; description="Office Open XML Presentation Slide Show"; 
nametemplate=%s.ppsx; priority=3
+application/vnd.openxmlformats-officedocument.presentationml.template; soffice 
-no-oosplash --impress '%s'; edit=soffice -no-oosplash --impress '%s'; 
test=test -n "$DISPLAY"; description="Office Open XML Presentation Template"; 
nametemplate=%s.potx; priority=3
 
 # Microsoft PowerPoint
-application/vnd.ms-powerpoint; soffice -no-oosplash -impress '%s'; 
edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; 
description="Microsoft PowerPoint Document"; nametemplate=%s.ppt; priority=3
+application/vnd.ms-powerpoint; soffice -no-oosplash --impress '%s'; 
edit=soffice -no-oosplash --impress '%s'; test=test -n "$DISPLAY"; 
description="Microsoft PowerPoint Document"; nametemplate=%s.ppt; priority=3
 
 # OASIS OpenDocument Format
-application/vnd.oasis.opendocument.presentation; soffice -no-oosplash -impress 
'%s'; edit=soffice -no-oosplash -impress '%s'; print=soffice -no-oosplash 
-impress -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument 
Presentation"; nametemplate=%s.odp; priority=9
-application/vnd.oasis.opendocument.presentation-template; soffice -no-oosplash 
-impress '%s'; edit=soffice -no-oosplash -impress '%s'; print=soffice 
-no-oosplash -impress -p '%s'; test=test -n "$DISPLAY"; 
description="OpenDocument Presentation Template"; nametemplate=%s.otp; 
priority=9
+application/vnd.oasis.opendocument.presentation; soffice -no-oosplash 
--impress '%s'; edit=soffice -no-oosplash --impress '%s'; print=soffice 
-no-oosplash --impress -p '%s'; test=test -n "$DISPLAY"; 
description="OpenDocument Presentation"; nametemplate=%s.odp; priority=9
+application/vnd.oasis.opendocument.presentation-template; soffice -no-oosplash 
--impress '%s'; edit=soffice -no-oosplash --impress '%s'; print=soffice 
-no-oosplash --impress -p '%s'; test=test -n "$DISPLAY"; 
description="OpenDocument Presentation Template"; nametemplate=%s.otp; 
priority=9
 
 # OpenOffice.org 1.0
-application/vnd.sun.xml.impress; soffice -no-oosplash -impress '%s'; 
edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; 
description="OpenOffice.org Presentation"; nametemplate=%s.sxi; priority=8
-application/vnd.sun.xml.impress.template; soffice -no-oosplash -impress '%s'; 
edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; 
description="OpenOffice.org Presentation Template"; nametemplate=%s.sti; 
priority=8
+application/vnd.sun.xml.impress; soffice -no-oosplash --impress '%s'; 
edit=soffice -no-oosplash --impress '%s'; test=test -n "$DISPLAY"; 
description="OpenOffice.org Presentation"; nametemplate=%s.sxi; priority=8
+application/vnd.sun.xml.impress.template; soffice -no-oosplash --impress '%s'; 
edit=soffice -no-oosplash --impress '%s'; test=test -n "$DISPLAY"; 
description="OpenOffice.org Presentation Template"; nametemplate=%s.sti; 
priority=8
 
 #
 ###
diff --git a/libreoffice-math.menu.in b/libreoffice-math.menu.in
index 216a5be..60d883a 100644
--- a/libreoffice-math.menu.in
+++ b/libreoffice-math.menu.in
@@ -1,6 +1,5 @@
 ?package(libreoffice-math):needs="X11" 
section="Applications/Science/Mathematics"\
-  title="LibreOffice Math" command="/usr/bin/libreoffice -math"\
+  title="LibreOffice Math" command="/usr/bin/libreoffice --math"\
   hints="Equation,Editor,Formula"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-math.xpm"
-
diff --git a/libreoffice-math.mime b/libreoffice-math.mime
index ce5de35..7888636 100644
--- a/libreoffice-math.mime
+++ b/libreoffice-math.mime
@@ -2,13 +2,13 @@
 # shared-mime-info
 
 # Generic
-text/mathml; soffice -no-oosplash -math '%s'; edit=soffice -no-oosplash -math 
'%s'; test=test -n "$DISPLAY"; description="MathML Formula"; 
nametemplate=%s.mml; priority=3
+text/mathml; soffice -no-oosplash --math '%s'; edit=soffice -no-oosplash 
--math '%s'; test=test -n "$DISPLAY"; description="MathML Formula"; 
nametemplate=%s.mml; priority=3
 
 # OASIS OpenDocument Format
-application/vnd.oasis.opendocument.formula; soffice -no-oosplash -math '%s'; 
edit=soffice -no-oosplash -math '%s'; print=soffice -no-oosplash -math -p '%s'; 
test=test -n "$DISPLAY"; description="OpenDocument Formula"; 
nametemplate=%s.odf; priority=9
+application/vnd.oasis.opendocument.formula; soffice -no-oosplash --math '%s'; 
edit=soffice -no-oosplash --math '%s'; print=soffice -no-oosplash --math -p 
'%s'; test=test -n "$DISPLAY"; description="OpenDocument Formula"; 
nametemplate=%s.odf; priority=9
 
 # OpenOffice.org 1.0
-application/vnd.sun.xml.math; soffice -no-oosplash -math '%s'; edit=soffice 
-no-oosplash -math '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org 
Formula"; nametemplate=%s.sxm; priority=8
+application/vnd.sun.xml.math; soffice -no-oosplash --math '%s'; edit=soffice 
-no-oosplash --math '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org 
Formula"; nametemplate=%s.sxm; priority=8
 
 #
 ###
diff --git a/libreoffice-writer.menu.in b/libreoffice-writer.menu.in
index 5df1604..6be2556 100644
--- a/libreoffice-writer.menu.in
+++ b/libreoffice-writer.menu.in
@@ -1,6 +1,5 @@
 ?package(libreoffice-writer):needs="X11" section="Applications/Office"\
-  title="LibreOffice Writer" command="/usr/bin/libreoffice -writer"\
+  title="LibreOffice Writer" command="/usr/bin/libreoffice --writer"\
   hints="Word Processors"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-writer.xpm"
-
diff --git a/libreoffice-writer.mime b/libreoffice-writer.mime
index 19df985..ff3c47c 100644
--- a/libreoffice-writer.mime
+++ b/libreoffice-writer.mime
@@ -2,35 +2,35 @@
 # shared-mime-info
 
 # Generic
-application/rtf; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash 
-writer '%s'; test=test -n "$DISPLAY"; description="Rich Text Format"; 
nametemplate=%s.rtf; priority=3
-application/x-extension-txt; soffice -no-oosplash -writer '%s'; edit=soffice 
-no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="Plain Text 
Document"; nametemplate=%s.txt; priority=3
-application/x-t602; soffice -no-oosplash -writer '%s'; edit=soffice 
-no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="T602 
Document"; nametemplate=%s.602; priority=3
+application/rtf; soffice -no-oosplash --writer '%s'; edit=soffice -no-oosplash 
--writer '%s'; test=test -n "$DISPLAY"; description="Rich Text Format"; 
nametemplate=%s.rtf; priority=3
+application/x-extension-txt; soffice -no-oosplash --writer '%s'; edit=soffice 
-no-oosplash --writer '%s'; test=test -n "$DISPLAY"; description="Plain Text 
Document"; nametemplate=%s.txt; priority=3
+application/x-t602; soffice -no-oosplash --writer '%s'; edit=soffice 
-no-oosplash --writer '%s'; test=test -n "$DISPLAY"; description="T602 
Document"; nametemplate=%s.602; priority=3
 
 # Corel WordPerfect
-application/vnd.wordperfect; soffice -no-oosplash -writer '%s'; edit=soffice 
-no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="WordPerfect 
Document"; nametemplate=%s.wp; priority=3
+application/vnd.wordperfect; soffice -no-oosplash --writer '%s'; edit=soffice 
-no-oosplash --writer '%s'; test=test -n "$DISPLAY"; description="WordPerfect 
Document"; nametemplate=%s.wp; priority=3
 
 # ECMA Office Open XML (Microsoft Office 2007)
-application/vnd.ms-word.document.macroEnabled.12; soffice -no-oosplash -writer 
'%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; 
description="Office Open XML Document with Macros Enabled"; 
nametemplate=%s.docm; priority=3
-application/vnd.ms-word.template.macroEnabled.12; soffice -no-oosplash -writer 
'%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; 
description="Office Open XML Document Template with Macros Enabled"; 
nametemplate=%s.dotm; priority=3
-application/vnd.openxmlformats-officedocument.wordprocessingml.document; 
soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; 
test=test -n "$DISPLAY"; description="Office Open XML Document"; 
nametemplate=%s.docx; priority=3
-application/vnd.openxmlformats-officedocument.wordprocessingml.template; 
soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; 
test=test -n "$DISPLAY"; description="Office Open XML Document Template"; 
nametemplate=%s.dotx; priority=3
+application/vnd.ms-word.document.macroEnabled.12; soffice -no-oosplash 
--writer '%s'; edit=soffice -no-oosplash --writer '%s'; test=test -n 
"$DISPLAY"; description="Office Open XML Document with Macros Enabled"; 
nametemplate=%s.docm; priority=3
+application/vnd.ms-word.template.macroEnabled.12; soffice -no-oosplash 
--writer '%s'; edit=soffice -no-oosplash --writer '%s'; test=test -n 
"$DISPLAY"; description="Office Open XML Document Template with Macros 
Enabled"; nametemplate=%s.dotm; priority=3
+application/vnd.openxmlformats-officedocument.wordprocessingml.document; 
soffice -no-oosplash --writer '%s'; edit=soffice -no-oosplash --writer '%s'; 
test=test -n "$DISPLAY"; description="Office Open XML Document"; 
nametemplate=%s.docx; priority=3
+application/vnd.openxmlformats-officedocument.wordprocessingml.template; 
soffice -no-oosplash --writer '%s'; edit=soffice -no-oosplash --writer '%s'; 
test=test -n "$DISPLAY"; description="Office Open XML Document Template"; 
nametemplate=%s.dotx; priority=3
 
 # Microsoft Word
-application/msword; soffice -no-oosplash -writer '%s'; edit=soffice 
-no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="Microsoft Word 
Document"; nametemplate=%s.doc; priority=3
+application/msword; soffice -no-oosplash --writer '%s'; edit=soffice 
-no-oosplash --writer '%s'; test=test -n "$DISPLAY"; description="Microsoft 
Word Document"; nametemplate=%s.doc; priority=3
 
 # Microsoft Works
-application/vnd.ms-works; soffice -no-oosplash -writer '%s'; edit=soffice 
-no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="Microsoft 
Works Document"; nametemplate=%s.wps; priority=3
+application/vnd.ms-works; soffice -no-oosplash --writer '%s'; edit=soffice 
-no-oosplash --writer '%s'; test=test -n "$DISPLAY"; description="Microsoft 
Works Document"; nametemplate=%s.wps; priority=3
 
 # OASIS OpenDocument Format
-application/vnd.oasis.opendocument.text; soffice -no-oosplash -writer '%s'; 
edit=soffice -no-oosplash -writer '%s'; print=soffice -no-oosplash -writer -p 
'%s'; test=test -n "$DISPLAY"; description="OpenDocument Text Document"; 
nametemplate=%s.odt; priority=9
-application/vnd.oasis.opendocument.text-master; soffice -no-oosplash -global 
'%s'; edit=soffice -no-oosplash -writer '%s'; print=soffice -no-oosplash 
-writer -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Master 
Document"; nametemplate=%s.odm; priority=9
-application/vnd.oasis.opendocument.text-template; soffice -no-oosplash -writer 
'%s'; edit=soffice -no-oosplash -writer '%s'; print=soffice -no-oosplash 
-writer -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Text 
Document Template"; nametemplate=%s.ott; priority=9
-application/vnd.oasis.opendocument.text-web; soffice -no-oosplash -web '%s'; 
edit=soffice -no-oosplash -web '%s'; print=soffice -no-oosplash -web -p '%s'; 
test=test -n "$DISPLAY"; description="OpenDocument HTML Document Template"; 
nametemplate=%s.oth; priority=9
+application/vnd.oasis.opendocument.text; soffice -no-oosplash --writer '%s'; 
edit=soffice -no-oosplash --writer '%s'; print=soffice -no-oosplash --writer -p 
'%s'; test=test -n "$DISPLAY"; description="OpenDocument Text Document"; 
nametemplate=%s.odt; priority=9
+application/vnd.oasis.opendocument.text-master; soffice -no-oosplash --global 
'%s'; edit=soffice -no-oosplash --writer '%s'; print=soffice -no-oosplash 
--writer -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Master 
Document"; nametemplate=%s.odm; priority=9
+application/vnd.oasis.opendocument.text-template; soffice -no-oosplash 
--writer '%s'; edit=soffice -no-oosplash --writer '%s'; print=soffice 
-no-oosplash --writer -p '%s'; test=test -n "$DISPLAY"; 
description="OpenDocument Text Document Template"; nametemplate=%s.ott; 
priority=9
+application/vnd.oasis.opendocument.text-web; soffice -no-oosplash --web '%s'; 
edit=soffice -no-oosplash --web '%s'; print=soffice -no-oosplash --web -p '%s'; 
test=test -n "$DISPLAY"; description="OpenDocument HTML Document Template"; 
nametemplate=%s.oth; priority=9
 
 # OpenOffice.org 1.0
-application/vnd.sun.xml.writer; soffice -no-oosplash -writer '%s'; 
edit=soffice -no-oosplash -writer '%s'; description="OpenOffice.org Text 
Document"; nametemplate=%s.sxw; priority=8
-application/vnd.sun.xml.writer.global; soffice -no-oosplash -global '%s'; 
edit=soffice -no-oosplash -writer '%s'; description="OpenOffice.org Master 
Document"; nametemplate=%s.sxg; priority=8
-application/vnd.sun.xml.writer.template; soffice -no-oosplash -writer '%s'; 
edit=soffice -no-oosplash -writer '%s'; description="OpenOffice.org Text 
Document Template"; nametemplate=%s.stw; priority=8
+application/vnd.sun.xml.writer; soffice -no-oosplash --writer '%s'; 
edit=soffice -no-oosplash --writer '%s'; description="OpenOffice.org Text 
Document"; nametemplate=%s.sxw; priority=8
+application/vnd.sun.xml.writer.global; soffice -no-oosplash --global '%s'; 
edit=soffice -no-oosplash --writer '%s'; description="OpenOffice.org Master 
Document"; nametemplate=%s.sxg; priority=8
+application/vnd.sun.xml.writer.template; soffice -no-oosplash --writer '%s'; 
edit=soffice -no-oosplash --writer '%s'; description="OpenOffice.org Text 
Document Template"; nametemplate=%s.stw; priority=8
 
 #
 ###
-- 
1.7.5.4

Reply via email to