[Libreoffice-commits] core.git: bin/distro-install-desktop-integration sysui/CustomTarget_deb.mk sysui/CustomTarget_share.mk sysui/desktop
Chris Mayo (via logerrit)
logerrit at kemper.freedesktop.org
Sat Nov 14 15:31:50 UTC 2020
bin/distro-install-desktop-integration | 5
sysui/CustomTarget_deb.mk | 1
sysui/CustomTarget_share.mk | 36 ---
sysui/desktop/freedesktop/freedesktop-menus.spec | 3
sysui/desktop/mimetypes/drawing-template.keys | 10 -
sysui/desktop/mimetypes/drawing.keys | 10 -
sysui/desktop/mimetypes/extension.keys | 10 -
sysui/desktop/mimetypes/formula.keys | 10 -
sysui/desktop/mimetypes/master-document.keys | 10 -
sysui/desktop/mimetypes/ms-excel-sheet-12.keys | 10 -
sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys | 10 -
sysui/desktop/mimetypes/ms-excel-sheet.keys | 10 -
sysui/desktop/mimetypes/ms-excel-template-12.keys | 10 -
sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys | 10 -
sysui/desktop/mimetypes/ms-powerpoint-presentation.keys | 10 -
sysui/desktop/mimetypes/ms-powerpoint-template-12.keys | 10 -
sysui/desktop/mimetypes/ms-word-document-12.keys | 10 -
sysui/desktop/mimetypes/ms-word-document.keys | 10 -
sysui/desktop/mimetypes/ms-word-document2.keys | 10 -
sysui/desktop/mimetypes/ms-word-template-12.keys | 10 -
sysui/desktop/mimetypes/oasis-database.keys | 10 -
sysui/desktop/mimetypes/oasis-drawing-flat-xml.keys | 10 -
sysui/desktop/mimetypes/oasis-drawing-template.keys | 10 -
sysui/desktop/mimetypes/oasis-drawing.keys | 10 -
sysui/desktop/mimetypes/oasis-formula.keys | 10 -
sysui/desktop/mimetypes/oasis-master-document-template.keys | 9
sysui/desktop/mimetypes/oasis-master-document.keys | 10 -
sysui/desktop/mimetypes/oasis-presentation-flat-xml.keys | 10 -
sysui/desktop/mimetypes/oasis-presentation-template.keys | 10 -
sysui/desktop/mimetypes/oasis-presentation.keys | 10 -
sysui/desktop/mimetypes/oasis-spreadsheet-flat-xml.keys | 10 -
sysui/desktop/mimetypes/oasis-spreadsheet-template.keys | 10 -
sysui/desktop/mimetypes/oasis-spreadsheet.keys | 10 -
sysui/desktop/mimetypes/oasis-text-flat-xml.keys | 10 -
sysui/desktop/mimetypes/oasis-text-template.keys | 9
sysui/desktop/mimetypes/oasis-text.keys | 10 -
sysui/desktop/mimetypes/oasis-web-template.keys | 10 -
sysui/desktop/mimetypes/openoffice.applications | 9
sysui/desktop/mimetypes/openoffice.mime | 95 ----------
sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys | 10 -
sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys | 10 -
sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys | 10 -
sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys | 10 -
sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys | 10 -
sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys | 10 -
sysui/desktop/mimetypes/presentation-template.keys | 10 -
sysui/desktop/mimetypes/presentation.keys | 10 -
sysui/desktop/mimetypes/spreadsheet-template.keys | 10 -
sysui/desktop/mimetypes/spreadsheet.keys | 10 -
sysui/desktop/mimetypes/text-template.keys | 9
sysui/desktop/mimetypes/text.keys | 10 -
sysui/desktop/share/create_tree.sh | 11 -
sysui/desktop/solaris/prototype | 5
53 files changed, 2 insertions(+), 610 deletions(-)
New commits:
commit e58a5f6db6d13d078f12c3496f46c227c6943c48
Author: Chris Mayo <aklhfex at gmail.com>
AuthorDate: Wed Nov 11 19:27:52 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Nov 14 16:30:58 2020 +0100
Remove obsolete GNOME 2 MIME types files
Installed as:
/usr/share/application-registry/libreoffice.applications
/usr/share/mime-info/libreoffice.keys
/usr/share/mime-info/libreoffice.mime
Superseded by Shared MIME-info compliant libreoffice.xml, created as
openoffice.org.xml by create_mime_xml.pl from the .desktop files.
Change-Id: Ib8d9a17d09139dd4f50f65572457cef0178750b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105606
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 1da104e47621..e9ddd3370ee2 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -112,7 +112,6 @@ sed -i \
export PRODUCTVERSION=
export KDEMAINDIR=$PREFIXDIR
export PREFIXDIR=${PREFIXDIR}
- export GNOMEDIR=$PREFIXDIR
export GNOME_MIME_THEME=hicolor
export APPDATA_SOURCE_DIR="${SRCDIR?}"/sysui/desktop/appstream-appdata
bash ./create_tree.sh
@@ -139,9 +138,7 @@ cd -
# put the stuff installed by create_tree.sh into the right file lists
# desktop files will be added by the corresponding add_wrapper command
if test -f $DESTDIR/gid_Module_Root_Brand ; then
- for dir in $PREFIXDIR/share/application-registry \
- $PREFIXDIR/share/mime/packages \
- $PREFIXDIR/share/mime-info \
+ for dir in $PREFIXDIR/share/mime/packages \
$PREFIXDIR/share/icons ; do
find "$DESTDIR$dir" \( -type f -o -type l \) -printf "$dir/%P\n" >>$DESTDIR/gid_Module_Root_Brand
done
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index 92cda34a3bfe..44afba7233ee 100644
--- a/sysui/CustomTarget_deb.mk
+++ b/sysui/CustomTarget_deb.mk
@@ -45,7 +45,6 @@ $(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(call gb_CustomTarget_ge
&& DESTDIR=$(deb_WORKDIR)/$* \
ICON_PREFIX=$(UNIXFILENAME.$*) \
KDEMAINDIR=/usr \
- GNOMEDIR=/usr \
PREFIXDIR=/usr \
./create_tree.sh
sed $(deb_SRCDIR)/openoffice.org-debian-menus \
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index 47f86ba37420..1f578f5ffcf5 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -108,7 +108,6 @@ share_ICONS := $(foreach size,16x16 32x32 48x48,\
$(foreach mime,$(MIMEICONLIST),\
$(share_SRCDIR)/icons/$(contrast)/$(size)/mimetypes/$(mime).png)))
-MIMEKEYS := $(foreach mime,$(MIMELIST),$(share_SRCDIR)/mimetypes/$(mime).keys)
MIMEDESKTOPS := $(foreach mime,$(MIMELIST),$(share_SRCDIR)/mimetypes/$(mime).desktop)
ULFS := documents.ulf \
launcher_comment.ulf \
@@ -122,9 +121,6 @@ $(eval $(call gb_CustomTarget_register_targets,sysui/share,\
$(foreach product,$(PRODUCTLIST),\
$(product)/build.flag \
$(product)/openoffice.org.xml \
- $(product)/openoffice.mime \
- $(product)/openoffice.applications \
- $(product)/openoffice.keys \
$(product)/openoffice.sh \
$(product)/create_tree.sh \
$(if $(INTROSPECTION_SCANNER),\
@@ -139,28 +135,6 @@ $(share_WORKDIR)/%/openoffice.org.xml: $(share_WORKDIR)/documents.ulf $(MIMEDESK
$(PERL) $(share_SRCDIR)/share/create_mime_xml.pl $< > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
-$(share_WORKDIR)/%/openoffice.keys: \
- $(share_SRCDIR)/mimetypes/openoffice.mime $(MIMEKEYS) $(share_SRCDIR)/share/brand.pl \
- $(share_TRANSLATE) $(share_WORKDIR)/documents.ulf \
- $(call gb_ExternalExecutable_get_dependencies,python)
- mkdir -p $(dir $@)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
- $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
- $(PERL) $(share_SRCDIR)/share/brand.pl -p $* -u $(UNIXFILENAME.$*) \
- --iconprefix $(UNIXFILENAME.$*)- $(MIMEKEYS) $(share_WORKDIR)/$*
- $(call gb_ExternalExecutable_get_command,python) $(share_TRANSLATE) \
- -p $* -d $(share_WORKDIR)/$* \
- --ext "keys" --key "description" $(share_WORKDIR)/documents.ulf
- cat $(MIMEKEYS) > $@
- $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
-
-$(share_WORKDIR)/%/openoffice.mime: $(share_SRCDIR)/mimetypes/openoffice.mime
- mkdir -p $(dir $@)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
- $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CAT)
- cat $< | tr -d "\015" > $@
- $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CAT)
-
$(share_WORKDIR)/%/openoffice.sh: $(share_SRCDIR)/share/openoffice.sh
mkdir -p $(dir $@)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
@@ -169,8 +143,7 @@ $(share_WORKDIR)/%/openoffice.sh: $(share_SRCDIR)/share/openoffice.sh
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CAT)
$(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh \
- $(share_WORKDIR)/%/openoffice.org.xml $(share_WORKDIR)/%/openoffice.applications $(share_WORKDIR)/%/openoffice.mime \
- $(share_WORKDIR)/%/openoffice.keys $(share_WORKDIR)/%/launcherlist
+ $(share_WORKDIR)/%/openoffice.org.xml $(share_WORKDIR)/%/launcherlist
mkdir -p $(dir $@)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CAT)
@@ -218,13 +191,6 @@ $(share_WORKDIR)/%/launcherlist: $(LAUNCHERS)
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH)
-$(share_WORKDIR)/%/openoffice.applications: $(share_SRCDIR)/mimetypes/openoffice.applications
- mkdir -p $(dir $@)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
- $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CAT)
- cat $< | tr -d "\015" | sed -e "s/OFFICENAME/$(UNIXFILENAME.$*)/" -e "s/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION.$*)/" > $@
- $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CAT)
-
# these .desktop files are written by brand.pl below
# need to have a rule for these because they are targets in Package_share
define sysui_Desktop_rule
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 9375f00b902a..e6e713d42887 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -59,16 +59,13 @@ export DESTDIR=$RPM_BUILD_ROOT
export KDEMAINDIR=/usr
export PREFIXDIR=/usr
export BINDIR=/usr/bin
-export GNOMEDIR=%{gnome_dir}
./create_tree.sh
cd $RPM_BUILD_ROOT
# freedesktop-based desktop-environments don't need/use this.
-rm -rf usr/share/application-registry
rm -rf usr/share/applications.flag
-rm -rf usr/share/mime-info
rm -rf usr/share/applnk-redhat
#find usr/share/icons -name '*.png' -exec chmod g+w {} \;
diff --git a/sysui/desktop/mimetypes/drawing-template.keys b/sysui/desktop/mimetypes/drawing-template.keys
deleted file mode 100644
index 40e006d40b2e..000000000000
--- a/sysui/desktop/mimetypes/drawing-template.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.sun.xml.draw.template
- description=OpenOffice.org 1.0 Drawing Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_advanced_user_level=openoffice,staroffice,starsuite
- category=Documents
- use_category_default=no
- icon_filename=drawing-template
-
diff --git a/sysui/desktop/mimetypes/drawing.keys b/sysui/desktop/mimetypes/drawing.keys
deleted file mode 100644
index 891b0ecc8982..000000000000
--- a/sysui/desktop/mimetypes/drawing.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.sun.xml.draw
- description=OpenOffice.org 1.0 Drawing
- default_action_type=application
- short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_advanced_user_level=openoffice,staroffice,starsuite
- category=Documents
- use_category_default=no
- icon_filename=drawing
-
diff --git a/sysui/desktop/mimetypes/extension.keys b/sysui/desktop/mimetypes/extension.keys
deleted file mode 100644
index a307e5097c98..000000000000
--- a/sysui/desktop/mimetypes/extension.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.openofficeorg.extension
- description=Extension
- default_action_type=application
- short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_advanced_user_level=openoffice,staroffice,starsuite
- category=Documents/Word Processor
- use_category_default=no
- icon_filename=extension
-
diff --git a/sysui/desktop/mimetypes/formula.keys b/sysui/desktop/mimetypes/formula.keys
deleted file mode 100644
index f6b2b3a22404..000000000000
--- a/sysui/desktop/mimetypes/formula.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.sun.xml.math
- description=OpenOffice.org 1.0 Formula
- default_action_type=application
- short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_advanced_user_level=openoffice,staroffice,starsuite
- category=Documents
- use_category_default=no
- icon_filename=formula
-
diff --git a/sysui/desktop/mimetypes/master-document.keys b/sysui/desktop/mimetypes/master-document.keys
deleted file mode 100644
index 05936fee8041..000000000000
--- a/sysui/desktop/mimetypes/master-document.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.sun.xml.writer.global
- description=OpenOffice.org 1.0 Master Document
- default_action_type=application
- short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_advanced_user_level=openoffice,staroffice,starsuite
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=master-document
-
diff --git a/sysui/desktop/mimetypes/ms-excel-sheet-12.keys b/sysui/desktop/mimetypes/ms-excel-sheet-12.keys
deleted file mode 100644
index bbe182eba144..000000000000
--- a/sysui/desktop/mimetypes/ms-excel-sheet-12.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.ms-excel.sheet.macroEnabled.12
- description=Microsoft Excel Worksheet
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Spreadsheet
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys b/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys
deleted file mode 100644
index fb90ffb2bbaa..000000000000
--- a/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.ms-excel.sheet.binary.macroEnabled.12
- description=Microsoft Excel Worksheet
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Spreadsheet
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/ms-excel-sheet.keys b/sysui/desktop/mimetypes/ms-excel-sheet.keys
deleted file mode 100644
index fde5f41b0dbc..000000000000
--- a/sysui/desktop/mimetypes/ms-excel-sheet.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.ms-excel
- description=Microsoft Excel Worksheet
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Spreadsheet
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/ms-excel-template-12.keys b/sysui/desktop/mimetypes/ms-excel-template-12.keys
deleted file mode 100644
index 107dfa2fff66..000000000000
--- a/sysui/desktop/mimetypes/ms-excel-template-12.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.ms-excel.template.macroEnabled.12
- description=Microsoft Excel Worksheet Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Spreadsheet
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys b/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys
deleted file mode 100644
index 3ec7201fe5e9..000000000000
--- a/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.ms-powerpoint.presentation.macroEnabled.12
- description=Microsoft PowerPoint Presentation
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Presentation
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-presentation.keys b/sysui/desktop/mimetypes/ms-powerpoint-presentation.keys
deleted file mode 100644
index f808f5dcc217..000000000000
--- a/sysui/desktop/mimetypes/ms-powerpoint-presentation.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.ms-powerpoint
- description=Microsoft PowerPoint Presentation
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Presentation
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys b/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys
deleted file mode 100644
index 3084f8dfd589..000000000000
--- a/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.ms-powerpoint.template.macroEnabled.12
- description=Microsoft PowerPoint Presentation Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Presentation
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/ms-word-document-12.keys b/sysui/desktop/mimetypes/ms-word-document-12.keys
deleted file mode 100644
index 53b8f95f1aad..000000000000
--- a/sysui/desktop/mimetypes/ms-word-document-12.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.ms-word.document.macroEnabled.12
- description=Microsoft Word Document
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/ms-word-document.keys b/sysui/desktop/mimetypes/ms-word-document.keys
deleted file mode 100644
index aefa45037692..000000000000
--- a/sysui/desktop/mimetypes/ms-word-document.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/msword
- description=Microsoft Word Document
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/ms-word-document2.keys b/sysui/desktop/mimetypes/ms-word-document2.keys
deleted file mode 100644
index 260ee7f3a188..000000000000
--- a/sysui/desktop/mimetypes/ms-word-document2.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.ms-word
- description=Microsoft Word Document
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/ms-word-template-12.keys b/sysui/desktop/mimetypes/ms-word-template-12.keys
deleted file mode 100644
index c3d398813d90..000000000000
--- a/sysui/desktop/mimetypes/ms-word-template-12.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.ms-word.template.macroEnabled.12
- description=Microsoft Word Document Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/oasis-database.keys b/sysui/desktop/mimetypes/oasis-database.keys
deleted file mode 100644
index 19e97202b50a..000000000000
--- a/sysui/desktop/mimetypes/oasis-database.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.sun.xml.base
- description=OpenDocument Database
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents
- use_category_default=no
- icon_filename=oasis-database
-
diff --git a/sysui/desktop/mimetypes/oasis-drawing-flat-xml.keys b/sysui/desktop/mimetypes/oasis-drawing-flat-xml.keys
deleted file mode 100644
index bc4a6f3b4173..000000000000
--- a/sysui/desktop/mimetypes/oasis-drawing-flat-xml.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.oasis.opendocument.graphics-flat-xml
- description=OpenDocument Drawing (Flat XML)
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents
- use_category_default=no
- icon_filename=oasis-drawing
-
diff --git a/sysui/desktop/mimetypes/oasis-drawing-template.keys b/sysui/desktop/mimetypes/oasis-drawing-template.keys
deleted file mode 100644
index 8638fec329e4..000000000000
--- a/sysui/desktop/mimetypes/oasis-drawing-template.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.oasis.opendocument.graphics-template
- description=OpenDocument Drawing Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents
- use_category_default=no
- icon_filename=oasis-drawing-template
-
diff --git a/sysui/desktop/mimetypes/oasis-drawing.keys b/sysui/desktop/mimetypes/oasis-drawing.keys
deleted file mode 100644
index c659749ddbf5..000000000000
--- a/sysui/desktop/mimetypes/oasis-drawing.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.oasis.opendocument.graphics
- description=OpenDocument Drawing
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents
- use_category_default=no
- icon_filename=oasis-drawing
-
diff --git a/sysui/desktop/mimetypes/oasis-formula.keys b/sysui/desktop/mimetypes/oasis-formula.keys
deleted file mode 100644
index 60618cb21443..000000000000
--- a/sysui/desktop/mimetypes/oasis-formula.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.oasis.opendocument.formula
- description=OpenDocument Formula
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents
- use_category_default=no
- icon_filename=oasis-formula
-
diff --git a/sysui/desktop/mimetypes/oasis-master-document-template.keys b/sysui/desktop/mimetypes/oasis-master-document-template.keys
deleted file mode 100644
index 3cd4d5efdd00..000000000000
--- a/sysui/desktop/mimetypes/oasis-master-document-template.keys
+++ /dev/null
@@ -1,9 +0,0 @@
-application/vnd.oasis.opendocument.text-master-template
- description=OpenDocument Master Document Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=oasis-master-document-template
diff --git a/sysui/desktop/mimetypes/oasis-master-document.keys b/sysui/desktop/mimetypes/oasis-master-document.keys
deleted file mode 100644
index f950763205dd..000000000000
--- a/sysui/desktop/mimetypes/oasis-master-document.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.oasis.opendocument.text-master
- description=OpenDocument Master Document
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=oasis-master-document
-
diff --git a/sysui/desktop/mimetypes/oasis-presentation-flat-xml.keys b/sysui/desktop/mimetypes/oasis-presentation-flat-xml.keys
deleted file mode 100644
index f4c9b5816059..000000000000
--- a/sysui/desktop/mimetypes/oasis-presentation-flat-xml.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.oasis.opendocument.presentation-flat-xml
- description=OpenDocument Presentation (Flat XML)
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Presentation
- use_category_default=yes
- icon_filename=oasis-presentation
-
diff --git a/sysui/desktop/mimetypes/oasis-presentation-template.keys b/sysui/desktop/mimetypes/oasis-presentation-template.keys
deleted file mode 100644
index b504592a725d..000000000000
--- a/sysui/desktop/mimetypes/oasis-presentation-template.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.oasis.opendocument.presentation-template
- description=OpenDocument Presentation Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Presentation
- use_category_default=yes
- icon_filename=oasis-presentation-template
-
diff --git a/sysui/desktop/mimetypes/oasis-presentation.keys b/sysui/desktop/mimetypes/oasis-presentation.keys
deleted file mode 100644
index 07c10cfcadd6..000000000000
--- a/sysui/desktop/mimetypes/oasis-presentation.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.oasis.opendocument.presentation
- description=OpenDocument Presentation
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Presentation
- use_category_default=yes
- icon_filename=oasis-presentation
-
diff --git a/sysui/desktop/mimetypes/oasis-spreadsheet-flat-xml.keys b/sysui/desktop/mimetypes/oasis-spreadsheet-flat-xml.keys
deleted file mode 100644
index 2675c3295e43..000000000000
--- a/sysui/desktop/mimetypes/oasis-spreadsheet-flat-xml.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.oasis.opendocument.spreadsheet-flat-xml
- description=OpenDocument Spreadsheet (Flat XML)
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Spreadsheet
- use_category_default=yes
- icon_filename=oasis-spreadsheet
-
diff --git a/sysui/desktop/mimetypes/oasis-spreadsheet-template.keys b/sysui/desktop/mimetypes/oasis-spreadsheet-template.keys
deleted file mode 100644
index e616a4f3a973..000000000000
--- a/sysui/desktop/mimetypes/oasis-spreadsheet-template.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.oasis.opendocument.spreadsheet-template
- description=OpenDocument Spreadsheet Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Spreadsheet
- use_category_default=yes
- icon_filename=oasis-spreadsheet-template
-
diff --git a/sysui/desktop/mimetypes/oasis-spreadsheet.keys b/sysui/desktop/mimetypes/oasis-spreadsheet.keys
deleted file mode 100644
index 009f630e166a..000000000000
--- a/sysui/desktop/mimetypes/oasis-spreadsheet.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.oasis.opendocument.spreadsheet
- description=OpenDocument Spreadsheet
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Spreadsheet
- use_category_default=yes
- icon_filename=oasis-spreadsheet
-
diff --git a/sysui/desktop/mimetypes/oasis-text-flat-xml.keys b/sysui/desktop/mimetypes/oasis-text-flat-xml.keys
deleted file mode 100644
index aaedf1221cfc..000000000000
--- a/sysui/desktop/mimetypes/oasis-text-flat-xml.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.oasis.opendocument.text-flat-xml
- description=OpenDocument Text (Flat XML)
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=oasis-text
-
diff --git a/sysui/desktop/mimetypes/oasis-text-template.keys b/sysui/desktop/mimetypes/oasis-text-template.keys
deleted file mode 100644
index 3ce0868d69a9..000000000000
--- a/sysui/desktop/mimetypes/oasis-text-template.keys
+++ /dev/null
@@ -1,9 +0,0 @@
-application/vnd.oasis.opendocument.text-template
- description=OpenDocument Text Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=oasis-text-template
diff --git a/sysui/desktop/mimetypes/oasis-text.keys b/sysui/desktop/mimetypes/oasis-text.keys
deleted file mode 100644
index acc8a2916260..000000000000
--- a/sysui/desktop/mimetypes/oasis-text.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.oasis.opendocument.text
- description=OpenDocument Text
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=oasis-text
-
diff --git a/sysui/desktop/mimetypes/oasis-web-template.keys b/sysui/desktop/mimetypes/oasis-web-template.keys
deleted file mode 100644
index 888e45870e75..000000000000
--- a/sysui/desktop/mimetypes/oasis-web-template.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.oasis.opendocument.text-web
- description=HTML Document Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=oasis-web-template
-
diff --git a/sysui/desktop/mimetypes/openoffice.applications b/sysui/desktop/mimetypes/openoffice.applications
deleted file mode 100644
index c75498df4544..000000000000
--- a/sysui/desktop/mimetypes/openoffice.applications
+++ /dev/null
@@ -1,9 +0,0 @@
-OFFICENAME
- command=OFFICENAME
- name=%PRODUCTNAME
- can_open_multiple_files=true
- expects_uris=true
- requires_terminal=false
- uses_gnomevfs=true
- mime_types=application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-flat-xml,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.text-web,application/vnd.oasis.opendocument.text-master,application/vnd.oasis.opendocument.text-master-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-flat-xml,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-flat-xml,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-flat-xml,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.star
division.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,application/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.lotus-wordpro;application/vnd.openofficeorg.extension;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroEnabled.12;application/vnd.openxmlformats-officedo
cument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;application/x-hwp;text/spreadsheet;
-
diff --git a/sysui/desktop/mimetypes/openoffice.mime b/sysui/desktop/mimetypes/openoffice.mime
deleted file mode 100644
index 63b53e7ba840..000000000000
--- a/sysui/desktop/mimetypes/openoffice.mime
+++ /dev/null
@@ -1,95 +0,0 @@
-application/vnd.oasis.opendocument.text:
- ext: odt
-
-application/vnd.oasis.opendocument.text-flat-xml:
- ext: fodt
-
-application/vnd.oasis.opendocument.text-template:
- ext: ott
-
-application/vnd.oasis.opendocument.text-web:
- ext: oth
-
-application/vnd.oasis.opendocument.text-master:
- ext: odm
-
-application/vnd.oasis.opendocument.graphics:
- ext: odg
-
-application/vnd.oasis.opendocument.graphics-flat-xml:
- ext: fodg
-
-application/vnd.oasis.opendocument.graphics-template:
- ext: otg
-
-application/vnd.oasis.opendocument.presentation:
- ext: odp
-
-application/vnd.oasis.opendocument.presentation-flat-xml:
- ext: fodp
-
-application/vnd.oasis.opendocument.presentation-template:
- ext: otp
-
-application/vnd.oasis.opendocument.spreadsheet:
- ext: ods
-
-application/vnd.oasis.opendocument.spreadsheet-flat-xml:
- ext: fods
-
-application/vnd.oasis.opendocument.spreadsheet-template:
- ext: ots
-
-application/vnd.oasis.opendocument.formula:
- ext: odf
-
-application/vnd.sun.xml.base:
- ext: odb
-
-application/vnd.openxmlformats-officedocument.wordprocessingml.document
- ext: docx
-
-application/vnd.ms-word.document.macroEnabled.12
- ext: docm
-
-application/vnd.openxmlformats-officedocument.wordprocessingml.template
- ext: dotx
-
-application/vnd.ms-word.template.macroEnabled.12
- ext: dotm
-
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
- ext: xlsx
-
-application/vnd.ms-excel.sheet.macroEnabled.12
- ext: xlsm
-
-application/vnd.openxmlformats-officedocument.spreadsheetml.template
- ext: xltx
-
-application/vnd.ms-excel.template.macroEnabled.12
- ext: xltm
-
-application/vnd.openxmlformats-officedocument.presentationml.presentation
- ext: pptx
-
-application/vnd.ms-powerpoint.presentation.macroEnabled.12
- ext: pptm
-
-application/vnd.openxmlformats-officedocument.presentationml.template
- ext: potx
-
-application/vnd.ms-powerpoint.template.macroEnabled.12
- ext: potm
-
-application/vnd.ms-excel.sheet.binary.macroEnabled.12
- ext: xlsb
-
-application/vnd.ms-word
- ext: doc
-
-application/vnd.ms-excel
- ext: xls
-
-application/vnd.ms-powerpoint
- ext: ppt
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys
deleted file mode 100644
index 7061ccc88074..000000000000
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.openxmlformats-officedocument.presentationml.presentation
- description=Microsoft PowerPoint Presentation
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Presentation
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys
deleted file mode 100644
index 362b1eea1b30..000000000000
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.openxmlformats-officedocument.presentationml.template
- description=Microsoft PowerPoint Presentation Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Presentation
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys
deleted file mode 100644
index cf7a4babbe0e..000000000000
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
- description=Microsoft Excel Worksheet
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Spreadsheet
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys
deleted file mode 100644
index ab5a5918ba63..000000000000
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.openxmlformats-officedocument.spreadsheetml.template
- description=Microsoft Excel Worksheet Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Spreadsheet
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys
deleted file mode 100644
index 4e8f28bdba01..000000000000
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.openxmlformats-officedocument.wordprocessingml.document
- description=Microsoft Word Document
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys
deleted file mode 100644
index 8951ca3b595a..000000000000
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.openxmlformats-officedocument.wordprocessingml.template
- description=Microsoft Word Document Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=
- short_list_application_ids_for_intermediate_user_level=
- short_list_application_ids_for_advanced_user_level=
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=
-
diff --git a/sysui/desktop/mimetypes/presentation-template.keys b/sysui/desktop/mimetypes/presentation-template.keys
deleted file mode 100644
index b3585a8353c6..000000000000
--- a/sysui/desktop/mimetypes/presentation-template.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.sun.xml.impress.template
- description=OpenOffice.org 1.0 Presentation Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_advanced_user_level=openoffice,staroffice,starsuite
- category=Documents/Presentation
- use_category_default=yes
- icon_filename=presentation-template
-
diff --git a/sysui/desktop/mimetypes/presentation.keys b/sysui/desktop/mimetypes/presentation.keys
deleted file mode 100644
index 21e271628c4f..000000000000
--- a/sysui/desktop/mimetypes/presentation.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.sun.xml.impress
- description=OpenOffice.org 1.0 Presentation
- default_action_type=application
- short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_advanced_user_level=openoffice,staroffice,starsuite
- category=Documents/Presentation
- use_category_default=yes
- icon_filename=presentation
-
diff --git a/sysui/desktop/mimetypes/spreadsheet-template.keys b/sysui/desktop/mimetypes/spreadsheet-template.keys
deleted file mode 100644
index 210ffe2c9b8a..000000000000
--- a/sysui/desktop/mimetypes/spreadsheet-template.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.sun.xml.calc.template
- description=OpenOffice.org 1.0 Spreadsheet Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_advanced_user_level=openoffice,staroffice,starsuite
- category=Documents/Spreadsheet
- use_category_default=yes
- icon_filename=spreadsheet-template
-
diff --git a/sysui/desktop/mimetypes/spreadsheet.keys b/sysui/desktop/mimetypes/spreadsheet.keys
deleted file mode 100644
index 8288622348c7..000000000000
--- a/sysui/desktop/mimetypes/spreadsheet.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.sun.xml.calc
- description=OpenOffice.org 1.0 Spreadsheet
- default_action_type=application
- short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_advanced_user_level=openoffice,staroffice,starsuite
- category=Documents/Spreadsheet
- use_category_default=yes
- icon_filename=spreadsheet
-
diff --git a/sysui/desktop/mimetypes/text-template.keys b/sysui/desktop/mimetypes/text-template.keys
deleted file mode 100644
index 0f6f4ebf4d5c..000000000000
--- a/sysui/desktop/mimetypes/text-template.keys
+++ /dev/null
@@ -1,9 +0,0 @@
-application/vnd.sun.xml.writer.template
- description=OpenOffice.org 1.0 Text Document Template
- default_action_type=application
- short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_advanced_user_level=openoffice,staroffice,starsuite
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=text-template
diff --git a/sysui/desktop/mimetypes/text.keys b/sysui/desktop/mimetypes/text.keys
deleted file mode 100644
index 316f64176adf..000000000000
--- a/sysui/desktop/mimetypes/text.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-application/vnd.sun.xml.writer
- description=OpenOffice.org 1.0 Text Document
- default_action_type=application
- short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
- short_list_application_ids_for_advanced_user_level=openoffice,staroffice,starsuite
- category=Documents/Word Processor
- use_category_default=yes
- icon_filename=text
-
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 68fc38c4a716..6b94395aac26 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -31,17 +31,6 @@ if [ "${KDEMAINDIR}" ]; then
fi
-if [ "${GNOMEDIR}" ]; then
- mkdir -p "${DESTDIR}/${GNOMEDIR}/share/mime-info"
- cp openoffice.mime "${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.mime"
- cp openoffice.keys "${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.keys"
- chmod 0644 "${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}".*
-
- mkdir -p "${DESTDIR}/${GNOMEDIR}/share/application-registry"
- cp openoffice.applications "${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.applications"
- chmod 0644 "${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}".*
-fi
-
mkdir -p "${DESTDIR}/${BINDIR}"
test -n "${OFFICE_PREFIX}" && office_prefix="${OFFICE_PREFIX}" || office_prefix=/opt
diff --git a/sysui/desktop/solaris/prototype b/sysui/desktop/solaris/prototype
index 145c76ee13dc..201005e32682 100644
--- a/sysui/desktop/solaris/prototype
+++ b/sysui/desktop/solaris/prototype
@@ -12,8 +12,6 @@ d none usr/share 0755 root sys
d none usr/share/applications 0755 root other
d none usr/share/mime 0755 root root
d none usr/share/mime/packages 0755 root root
-d none usr/share/application-registry 0755 root other
-d none usr/share/mime-info 0755 root other
d none usr/share/pixmaps 0755 root other
d none share/mime 0755 root other
d none share/mime/packages 0755 root other
@@ -21,15 +19,12 @@ d none share/mime/packages 0755 root other
e build etc/mime.types=./mime.types
e build etc/mailcap=mailcap
f none usr/share/mime/packages/%PREFIX.xml=%SOURCE/openoffice.org.xml
-f none usr/share/application-registry/%PREFIX.applications=%SOURCE/openoffice.applications
s none usr/share/applications/%PREFIX-writer.desktop=../../../opt/%PREFIX/share/xdg/writer.desktop
s none usr/share/applications/%PREFIX-calc.desktop=../../../opt/%PREFIX/share/xdg/calc.desktop
s none usr/share/applications/%PREFIX-draw.desktop=../../../opt/%PREFIX/share/xdg/draw.desktop
s none usr/share/applications/%PREFIX-impress.desktop=../../../opt/%PREFIX/share/xdg/impress.desktop
s none usr/share/applications/%PREFIX-math.desktop=../../../opt/%PREFIX/share/xdg/math.desktop
s none usr/share/applications/%PREFIX-base.desktop=../../../opt/%PREFIX/share/xdg/base.desktop
-f none usr/share/mime-info/%PREFIX.keys=%SOURCE/openoffice.keys
-f none usr/share/mime-info/%PREFIX.mime=%SOURCE/openoffice.mime
f none usr/share/pixmaps/%ICONPREFIX-writer.png=../icons/hicolor/48x48/apps/writer.png
f none usr/share/pixmaps/%ICONPREFIX-calc.png=../icons/hicolor/48x48/apps/calc.png
f none usr/share/pixmaps/%ICONPREFIX-draw.png=../icons/hicolor/48x48/apps/draw.png
More information about the Libreoffice-commits
mailing list