ooo-build r12755 - in trunk: . patches/dev300 patches/ooxml

[pmladek svn gnome org]

Author: pmladek
Date: Mon Jun  2 17:28:27 2008
New Revision: 12755
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12755&view=rev

Log:
2008-06-02  Petr Mladek  <pmladek suse cz>

	* patches/ooxml/sysui-desktop-ooxml.diff, patches/dev300/apply: add
	  the OOXML-related MIME types also to the upstream desktop files;
	  needed for the universal GO-OO build



Added:
   trunk/patches/ooxml/sysui-desktop-ooxml.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jun  2 17:28:27 2008
@@ -1606,6 +1606,10 @@
 
 buildfix-oox-depends-on-unotools.diff
 
+# added the OOXML-related MIME types to the upstream desktop files
+# needed for the universal GO-OO build
+sysui-desktop-ooxml.diff, pmladek
+
 [ CalcFixes ]
 
 # Support several different formula syntax, and add a formula syntax

Added: trunk/patches/ooxml/sysui-desktop-ooxml.diff
==============================================================================
--- (empty file)
+++ trunk/patches/ooxml/sysui-desktop-ooxml.diff	Mon Jun  2 17:28:27 2008
@@ -0,0 +1,33 @@
+--- sysui/desktop/menus/calc.desktop.old	2008-03-06 15:55:40.000000000 +0100
++++ sysui/desktop/menus/calc.desktop	2008-06-02 18:31:11.000000000 +0200
+@@ -5,7 +5,7 @@ Icon=calc
+ Type=Application
+ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets;
+ Exec=openoffice -calc %U
+-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;
++MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.ms-excel.sheet.binary.macroEnabled.12;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;
+ Name=%PRODUCTNAME Calc
+ GenericName=Spreadsheet
+ Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
+--- sysui/desktop/menus/impress.desktop.old	2008-03-06 15:56:56.000000000 +0100
++++ sysui/desktop/menus/impress.desktop	2008-06-02 18:31:56.000000000 +0200
+@@ -5,7 +5,7 @@ Icon=impress
+ Type=Application
+ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations;
+ Exec=openoffice -impress %U
+-MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;
++MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;
+ Name=%PRODUCTNAME Impress
+ GenericName=Presentation
+ Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
+--- sysui/desktop/menus/writer.desktop.old	2008-04-15 16:45:38.000000000 +0200
++++ sysui/desktop/menus/writer.desktop	2008-06-02 18:31:31.000000000 +0200
+@@ -5,7 +5,7 @@ Icon=writer
+ Type=Application
+ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors;
+ Exec=openoffice -writer %U
+-MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;
++MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;
+ Name=%PRODUCTNAME Writer
+ GenericName=Word Processor
+ Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.