The following commit has been merged in the master branch:
commit 004b43162fdce7b5c481ac52b9e55c24d2ef64ea
Author: Rene Engelhard <rene@debian.org>
Date: Fri Mar 25 12:54:01 2011 +0100
* debian/*.mime:
- s/LibreOffice/OpenOffice.org/, it's OOo 1.0 file format after all
- add print= for OpenDocument mimetypes (closes: #619569)
diff --git a/changelog b/changelog
index 0a225a3..943fe56 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,9 @@ libreoffice (1:3.3.2-2) UNRELEASED; urgency=low
- really use internal libtextcat on squeeze (thanks dba)
* debian/libreoffice-common.postinst.in:
- try to remove /etc/openoffice if it's empty
+ * debian/*.mime:
+ - s/LibreOffice/OpenOffice.org/, it's OOo 1.0 file format after all
+ - add print= for OpenDocument mimetypes (closes: #619569)
-- Rene Engelhard <rene@debian.org> Thu, 24 Mar 2011 09:34:40 +0100
diff --git a/libreoffice-base.mime b/libreoffice-base.mime
index c7df986..cf3cef7 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'; 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
-# LibreOffice 1.0
-application/vnd.sun.xml.base; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; description="LibreOffice Database"; nametemplate=%s.sdb; priority=8
+# 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
#
###
diff --git a/libreoffice-calc.mime b/libreoffice-calc.mime
index 35cc1e9..9fc5bed 100644
--- a/libreoffice-calc.mime
+++ b/libreoffice-calc.mime
@@ -24,13 +24,13 @@ application/vnd.lotus-1-2-3; soffice -no-oosplash -calc '%s'; edit=soffice -no-o
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'; 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'; 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'; 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
-# LibreOffice 1.0
-application/vnd.sun.xml.calc; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="LibreOffice 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="LibreOffice Spreadsheet Template"; nametemplate=%s.stc; priority=8
+# 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
#
###
diff --git a/libreoffice-draw.mime b/libreoffice-draw.mime
index 8f3f92d..7f988f3 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'; 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'; 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
-# LibreOffice 1.0
-application/vnd.sun.xml.draw; soffice -no-oosplash -draw '%s'; edit=soffice -no-oosplash -draw '%s'; test=test -n "$DISPLAY"; description="LibreOffice 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="LibreOffice Drawing Template"; nametemplate=%s.std; priority=8
+# 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
#
###
diff --git a/libreoffice-impress.mime b/libreoffice-impress.mime
index 560be56..90fc076 100644
--- a/libreoffice-impress.mime
+++ b/libreoffice-impress.mime
@@ -13,12 +13,12 @@ application/vnd.openxmlformats-officedocument.presentationml.template; soffice -
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'; 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'; 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
-# LibreOffice 1.0
-application/vnd.sun.xml.impress; soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; description="LibreOffice 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="LibreOffice Presentation Template"; nametemplate=%s.sti; priority=8
+# 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
#
###
diff --git a/libreoffice-math.mime b/libreoffice-math.mime
index fdaf028..ce5de35 100644
--- a/libreoffice-math.mime
+++ b/libreoffice-math.mime
@@ -5,10 +5,10 @@
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'; 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
-# LibreOffice 1.0
-application/vnd.sun.xml.math; soffice -no-oosplash -math '%s'; edit=soffice -no-oosplash -math '%s'; test=test -n "$DISPLAY"; description="LibreOffice Formula"; nametemplate=%s.sxm; priority=8
+# 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
#
###
diff --git a/libreoffice-writer.mime b/libreoffice-writer.mime
index e435cf3..dd19969 100644
--- a/libreoffice-writer.mime
+++ b/libreoffice-writer.mime
@@ -22,15 +22,15 @@ application/msword; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash
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'; 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'; 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'; 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'; test=test -n "$DISPLAY"; description="OpenDocument HTML Document Template"; nametemplate=%s.oth; priority=9
-
-# LibreOffice 1.0
-application/vnd.sun.xml.writer; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; description="LibreOffice 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="LibreOffice 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="LibreOffice Text Document Template"; nametemplate=%s.stw; priority=8
+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
#
###
--
LibreOffice packaging repository