The following commit has been merged in the ubuntu-precise-3.5 branch: commit 3b4ccd897a6d1b34266b8cde620d7f6b5e0ac193 Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Thu Apr 26 02:43:06 2012 +0200
lp#904212: add missing mimetypes to impress.desktop * application/vnd.openxmlformats-officedocument.presentationml.slide * application/vnd.openxmlformats-officedocument.presentationml.slideshow diff --git a/patches/lp-904212-add-missing-mimetypes-to-impress.desktop.diff b/patches/lp-904212-add-missing-mimetypes-to-impress.desktop.diff new file mode 100644 index 0000000..8ff7c19 --- /dev/null +++ b/patches/lp-904212-add-missing-mimetypes-to-impress.desktop.diff @@ -0,0 +1,31 @@ +From 19bb32e40462042b7818383ded15f37ebda4fcbf Mon Sep 17 00:00:00 2001 +From: Bjoern Michaelsen <bjoern.michael...@canonical.com> +Date: Thu, 26 Apr 2012 02:10:36 +0200 +Subject: [PATCH] lp#904212: add missing mimetypes to impress.desktop + +* application/vnd.openxmlformats-officedocument.presentationml.slide +* application/vnd.openxmlformats-officedocument.presentationml.slideshow + +Conflicts: + + sysui/desktop/menus/impress.desktop +--- + sysui/desktop/menus/impress.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop +index 92060e3..e4bb88b 100755 +--- a/sysui/desktop/menus/impress.desktop ++++ b/sysui/desktop/menus/impress.desktop +@@ -5,7 +5,7 @@ Icon=impress + Type=Application + Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations; + Exec=${UNIXBASISROOTNAME} --impress %U +-MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;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; ++MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;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; + Name=%PRODUCTNAME Impress + GenericName=Presentation + Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress. +-- +1.7.9.5 + diff --git a/patches/series b/patches/series index 2c00411..13f251a 100644 --- a/patches/series +++ b/patches/series @@ -40,3 +40,4 @@ fdo-46687-fix-find-toolbar-X-error-handling.diff lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff lp-973134-default-to-Documents-for-saving-look-for-t.diff lp-527938-triple-paperbag-fix-service-name-again.diff +lp-904212-add-missing-mimetypes-to-impress.desktop.diff -- LibreOffice packaging repository -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1snjiu-0002ml...@vasks.debian.org