[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.4-6-123-gbd863f9
The following commit has been merged in the debian-experimental-3.6 branch:
commit 4eed81570b5325c033b6315a78dbbae0b79f0e9a
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jul 18 15:56:18 2012 +0200
lp-904212-add-missing-mimetypes-to-impress.desktop.dif seems upstream...
diff --git a/patches/lp-904212-add-missing-mimetypes-to-impress.desktop.diff b/patches/lp-904212-add-missing-mimetypes-to-impress.desktop.diff
deleted file mode 100644
index 8ff7c19..0000000
--- a/patches/lp-904212-add-missing-mimetypes-to-impress.desktop.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-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 7fc0942..de4a1cc 100644
--- a/patches/series
+++ b/patches/series
@@ -26,6 +26,5 @@ gtk3-hack-explicit-gmodule.diff
pyuno-py3-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
-#lp-904212-add-missing-mimetypes-to-impress.desktop.diff
disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
trying-to-force-CXX0X-off-for-ABI-incompatibility.diff
--
LibreOffice packaging repository
Reply to: