summaryrefslogtreecommitdiff
path: root/sysui
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2023-01-23 19:44:03 +0100
committerAndras Timar <andras.timar@collabora.com>2023-02-02 09:44:07 +0100
commit82b940f5b94967540e4feb6c7eadd89346ba6e3f (patch)
tree9365e79abcd7035bff704f742563eed7e2754c91 /sysui
parenta792d870ec7782caefac28a2bdf821c1680fbbea (diff)
tdf#45854 sysui: replace wrong ODB mime type
https://issues.oasis-open.org/browse/OFFICE-3745 was resolved. Replace all wrong: application/vnd.oasis.opendocument.database with: application/vnd.oasis.opendocument.base There is an identifier "org.oasis-open.opendocument.database" being used in some MacOSX Info.plist files - there is no indication that it needs to "match" the mime-type so leave it as is. Change-Id: Ic8e0d24e3aa74743801a670846daf2d322c33d70 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146040 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 53fe1f0880bc7e8a467404cddabb27daecfc37cb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146074 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sysui')
-rwxr-xr-xsysui/desktop/debian/postinst2
-rw-r--r--sysui/desktop/freedesktop/freedesktop-menus.spec4
-rw-r--r--sysui/desktop/macosx/Info.plist.in2
-rw-r--r--sysui/desktop/menus/base.desktop2
-rwxr-xr-xsysui/desktop/solaris/mailcap2
5 files changed, 6 insertions, 6 deletions
diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst
index dcb91680cb4e..f3220f311fdf 100755
--- a/sysui/desktop/debian/postinst
+++ b/sysui/desktop/debian/postinst
@@ -166,7 +166,7 @@ application/vnd.sun.xml.draw; %PREFIX -view %s
application/vnd.sun.xml.draw.template; %PREFIX -view %s
application/vnd.stardivision.draw; %PREFIX -view %s
application/x-stardraw; %PREFIX -view %s
-application/vnd.oasis.opendocument.database; %PREFIX -view %s
+application/vnd.oasis.opendocument.base; %PREFIX -view %s
application/vnd.sun.xml.base; %PREFIX -view %s
application/vnd.writerperfect; %PREFIX -view %s
application/wordperfect5.1; %PREFIX -view %s
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 2452a44b99dc..8ed6793a0de4 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -138,7 +138,7 @@ do
icon=${link_dir}/%iconprefix-formula.png; test -f ${icon} && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.sun.xml.math.png
icon=${link_dir}/%iconprefix-master-document.png; test -f ${icon} && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.sun.xml.writer.global.png
icon=${link_dir}/%iconprefix-oasis-database.png; test -f ${icon} && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.sun.xml.base.png
- icon=${link_dir}/%iconprefix-oasis-database.png; test -f ${icon} && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.database.png
+ icon=${link_dir}/%iconprefix-oasis-database.png; test -f ${icon} && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.base.png
icon=${link_dir}/%iconprefix-oasis-drawing.png; test -f ${icon} && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.graphics.png
icon=${link_dir}/%iconprefix-oasis-drawing-template.png; test -f ${icon} && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.graphics-template.png
icon=${link_dir}/%iconprefix-oasis-formula.png; test -f ${icon} && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.formula.png
@@ -307,7 +307,7 @@ application/vnd.sun.xml.draw; %unixfilename -view %s
application/vnd.sun.xml.draw.template; %unixfilename -view %s
application/vnd.stardivision.draw; %unixfilename -view %s
application/x-stardraw; %unixfilename -view %s
-application/vnd.oasis.opendocument.database; %unixfilename -view %s
+application/vnd.oasis.opendocument.base; %unixfilename -view %s
application/vnd.sun.xml.base; %unixfilename -view %s
application/vnd.openofficeorg.extension; %unixfilename %s
application/vnd.openxmlformats-officedocument.wordprocessingml.document; %unixfilename -view %s
diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in
index 23e7794d8c49..91b43b21ec21 100644
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -688,7 +688,7 @@
</array>
<key>public.mime-type</key>
<array>
- <string>application/vnd.oasis.opendocument.database</string>
+ <string>application/vnd.oasis.opendocument.base</string>
</array>
</dict>
<key>UTTypeIconFile</key>
diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index c2087120d532..7a678ca6bc18 100644
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -22,7 +22,7 @@ Icon=base
Type=Application
Categories=Office;Database;X-Red-Hat-Base;
Exec=${UNIXBASISROOTNAME} --base %%FILE%%
-MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
+MimeType=application/vnd.oasis.opendocument.base;application/vnd.sun.xml.base;
Name=%PRODUCTNAME Base
GenericName=Database Development
Comment=Manage databases, create queries and reports to track and manage your information.
diff --git a/sysui/desktop/solaris/mailcap b/sysui/desktop/solaris/mailcap
index 910fcbeb89cd..30b15ab90727 100755
--- a/sysui/desktop/solaris/mailcap
+++ b/sysui/desktop/solaris/mailcap
@@ -86,7 +86,7 @@ application/vnd.sun.xml.draw.template; %PREFIX -view %s
application/vnd.stardivision.draw; %PREFIX -view %s
application/x-stardraw; %PREFIX -view %s
application/vnd.sun.xml.base; %PREFIX -view %s
-application/vnd.oasis.opendocument.database; %PREFIX -view %s
+application/vnd.oasis.opendocument.base; %PREFIX -view %s
application/vnd.writerperfect; %PREFIX -view %s
application/wordperfect5.1; %PREFIX -view %s
application/x-wordperfect; %PREFIX -view %s