[Libreoffice-commits] core.git: 4 commits - bin/get-bugzilla-attachments-by-mimetype filter/source sysui/desktop

David Tardon dtardon at redhat.com
Wed Nov 20 01:42:17 PST 2013 

 bin/get-bugzilla-attachments-by-mimetype                      |    1 +
 filter/source/config/fragments/types/writer_FictionBook_2.xcu |    2 +-
 filter/source/config/fragments/types/writer_PalmDoc.xcu       |    2 +-
 sysui/desktop/menus/draw.desktop                              |    2 +-
 sysui/desktop/menus/impress.desktop                           |    2 +-
 sysui/desktop/menus/writer.desktop                            |    2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 56470d5f7a2503144f0e4586d5bb32beae332103
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Nov 20 10:39:37 2013 +0100

    add some new mimetypes
    
    Change-Id: Ia349d73eb30cf73a9bfbf70c95005bf74d70143c

diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 3483331..a807fe0 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -22,7 +22,7 @@ Icon=draw
 Type=Application
 Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing;
 Exec=${UNIXBASISROOTNAME} --draw %%FILE%%
-MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;
+MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;
 Name=%PRODUCTNAME Draw
 GenericName=Drawing Program
 Comment=Create and edit drawings, flow charts and logos by using Draw.
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
index 7efe610..fda44e4 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -22,7 +22,7 @@ Icon=impress
 Type=Application
 Categories=Office;Presentation;X-Red-Hat-Base;X-MandrivaLinux-Office-Presentations;
 Exec=${UNIXBASISROOTNAME} --impress %%FILE%%
-MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;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.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.oasis.opendocument.presentation-flat-xml;
+MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;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.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.oasis.opendocument.presentation-flat-xml;application/x-iwork-keynote-sffkey;
 Name=%PRODUCTNAME Impress
 GenericName=Presentation
 Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
index 25d30cb..e59187e 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -22,7 +22,7 @@ Icon=writer
 Type=Application
 Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors;
 Exec=${UNIXBASISROOTNAME} --writer %%FILE%%
-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/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;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.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;
+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/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;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.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;application/macwriteii;application/x-aportisdoc;applicatio
 n/prs.plucker;application/vnd.palm;application/clarisworks;
 Name=%PRODUCTNAME Writer
 GenericName=Word Processor
 Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
commit 12f263766d3c53f0f3977caf9715371be9dde7c5
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Nov 20 10:31:16 2013 +0100

    fix mime type for PalmDoc
    
    Change-Id: I3d1b24edd0165068efb31a34817ed9631fc05ec5

diff --git a/filter/source/config/fragments/types/writer_PalmDoc.xcu b/filter/source/config/fragments/types/writer_PalmDoc.xcu
index 8f91f7e..f45718a 100644
--- a/filter/source/config/fragments/types/writer_PalmDoc.xcu
+++ b/filter/source/config/fragments/types/writer_PalmDoc.xcu
@@ -15,7 +15,7 @@
         <value>pdb</value>
     </prop>
     <prop oor:name="MediaType">
-        <value>application/vnd.palm</value>
+        <value>application/x-aportisdoc</value>
     </prop>
     <prop oor:name="Preferred">
         <value>true</value>
commit 9635769f716fa27ccaadf78bc5a267b85c2f7e5b
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Nov 20 10:25:25 2013 +0100

    download fb2 files too
    
    Change-Id: I0a18ad70620cfd4263ffd3bc1423e00205e98f9b

diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype
index f0a6e9c..ac5967d 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -321,6 +321,7 @@ mimetypes = {
     'application/x-sony-bbeb' : 'lrf',
     'application/x-pocket-word': 'psw',
     'application/x-t602': '602',
+    'application/x-fictionbook+xml': 'fb2',
 # binfilter
     'application/x-starcalc': 'sdc',
     'application/vnd.stardivision.calc': 'sdc5',
commit 1733a484b28de9fd476f508c43a14e0bc933b9e6
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Nov 20 10:24:39 2013 +0100

    fix FictionBook2 mime type
    
    Change-Id: I921f33c2c712da5b542a40bfe4db1fba0f034e3f

diff --git a/filter/source/config/fragments/types/writer_FictionBook_2.xcu b/filter/source/config/fragments/types/writer_FictionBook_2.xcu
index 3b49a61..a6a5437 100644
--- a/filter/source/config/fragments/types/writer_FictionBook_2.xcu
+++ b/filter/source/config/fragments/types/writer_FictionBook_2.xcu
@@ -15,7 +15,7 @@
         <value>fb2 zip</value>
     </prop>
     <prop oor:name="MediaType">
-        <value>text/xml</value>
+        <value>application/x-fictionbook+xml</value>
     </prop>
     <prop oor:name="Preferred">
         <value>true</value>

More information about the Libreoffice-commits mailing list