[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-5-2-g11cfb9e
The following commit has been merged in the master branch:
commit 1f166e671ca3c108b3ab696e8a8a2502834321ec
Author: Bjoern Michaelsen <bjoern.michaelsen@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/changelog b/changelog
index 8901e44..fecc218 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.5.2-6) UNRELEASED; urgency=low
+
+ [ Björn Michaelsen ]
+ * add missing mimetypes to impress.desktop (LP: #904212)
+
+ -- Rene Engelhard <rene@debian.org> Thu, 26 Apr 2012 12:07:01 +0200
+
libreoffice (1:3.5.2-5) unstable; urgency=low
[ Rene Engelhard ]
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.michaelsen@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 6c29963..9601dc4 100644
--- a/patches/series
+++ b/patches/series
@@ -38,3 +38,4 @@ icu-4.9.diff
tests-fix-build-with-jdk7.diff
lp-926940-visio-mime-for-draw.diff
gcc-4.4.diff
+lp-904212-add-missing-mimetypes-to-impress.desktop.diff
--
LibreOffice packaging repository
Reply to: