Fixed gnome mime integration

4 files changed, 141 insertions, 4 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 488a0f9cdb96..f5665502a77e 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.20 2004/02/03 20:27:41 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.21 2004/02/04 10:48:17 suka Exp $
+
+  04 Feb 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.50.ebuild,
+  files/1.1.0/ximian-openoffice.keys:
+  GNOME mime type installation was incomplete, openoffice-ximian now registers
+  itself again as default application
 
   03 Feb 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.50.ebuild:
   This update further simplifies the ebuild and aims to fix the distcc
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index 7982f31a8a19..76e1febc271a 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,7 +1,7 @@
-MD5 befa18d81224aaf430551de1d70785e2 openoffice-ximian-1.1.50.ebuild 14598
+MD5 f8d303f26ec4914bc10e7965e35fa78e openoffice-ximian-1.1.50.ebuild 14680
 MD5 9db58898583f97148b0694d8802b0302 openoffice-ximian-1.1.46.ebuild 18267
 MD5 36e51c4b7897132fbaa9fd50702a02b7 openoffice-ximian-1.1.49.2-r1.ebuild 16320
-MD5 4d8ca525e92568315907cc74bc7eba8e ChangeLog 5795
+MD5 70003344c16b0b2e7cceec20251588c0 ChangeLog 6022
 MD5 470ef3ebe818b4cc6ab5c68bfe7269e2 openoffice-ximian-1.1.49.2.ebuild 15853
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 beaffcf9edb1e4ed7787b8e42a0f71d1 openoffice-ximian-1.1.47.3.ebuild 18331
@@ -19,6 +19,7 @@ MD5 9caea43966f68ba0f3d7c364c9a01b89 files/1.1.0/ooffice-wrapper-1.3 8964
 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.0/ximian-openoffice.applications 980
 MD5 d09a22a31a3dbfee9ac0e0902d200f75 files/1.1.0/norecent.patch 316
 MD5 6667ab40f65e61a03abde8bf78a350a3 files/1.1.0/xoo-presentation.desktop 2046
+MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.0/ximian-openoffice.keys 6298
 MD5 0855b12848982a02ab95d6a981926a43 files/1.1.0/xoo-spreadsheet.desktop 1863
 MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400
 MD5 9c99fdd340eb8e4c9f09c236eb1a899f files/1.1.0/xooffice-wrapper-1.3 9398
diff --git a/app-office/openoffice-ximian/files/1.1.0/ximian-openoffice.keys b/app-office/openoffice-ximian/files/1.1.0/ximian-openoffice.keys
new file mode 100644
index 000000000000..a669749676f2
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.0/ximian-openoffice.keys
@@ -0,0 +1,129 @@
+application/vnd.lotus-1-2-3
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.ms-excel
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/rtf
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/msword
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.ms-powerpoint
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.stardivision.calc
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.stardivision.chart
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.stardivision.draw
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.stardivision.impress
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.stardivision.mail
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.stardivision.math
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.stardivision.writer
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.sun.xml.calc
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.sun.xml.calc.template
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.sun.xml.draw
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.sun.xml.draw.template
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.sun.xml.impress
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.sun.xml.impress.template
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.sun.xml.math
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.sun.xml.writer
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.sun.xml.writer.global
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+application/vnd.sun.xml.writer.template
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+image/x-emf
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+image/x-pcx
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+image/x-photo-cd
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
+
+image/x-pict
+	short_list_application_ids_for_novice_user_level=ximian-openoffice
+	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
+	short_list_application_ids_for_advanced_user_level=ximian-openoffice
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.50.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.50.ebuild
index 3ccf6c6665d7..b9fb23f13304 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.50.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.50.ebuild,v 1.4 2004/02/03 20:27:41 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.50.ebuild,v 1.5 2004/02/04 10:48:17 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -469,6 +469,8 @@ src_install() {
 	doins ${S}/sysui/${SOLPATH}/misc/kde/share/mimelnk/application/*
 	insinto /usr/share/application-registry
 	doins ${FILESDIR}/${OO_VER}/ximian-openoffice.applications
+	insinto /usr/share/mime-info
+	doins ${FILESDIR}/${OO_VER}/ximian-openoffice.keys
 
 	# Install corrected Symbol Font
 	insinto /usr/X11R6/lib/X11/fonts/truetype/