[Libreoffice-commits] core.git: 2 commits - sysui/desktop

[David Tardon]

 sysui/desktop/mimetypes/ms-excel-sheet.desktop             |    1 -
 sysui/desktop/mimetypes/ms-excel-template-12.desktop       |    1 -
 sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop |    1 -
 sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop  |    1 -
 sysui/desktop/mimetypes/ms-word-document.desktop           |    1 -
 sysui/desktop/mimetypes/ms-word-template-12.desktop        |    1 -
 sysui/desktop/share/create_mime_xml.pl                     |    2 +-
 7 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 681a1ca27f606282a1fb3a60d67f61c0f3ba9579
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 24 22:46:04 2016 +0200

    improve debug output
    
    Change-Id: I7c5b8e67ee19e6a7d7909acb03d2d695cdc17a24

diff --git a/sysui/desktop/share/create_mime_xml.pl b/sysui/desktop/share/create_mime_xml.pl
index 92d4310..da2b198 100755
--- a/sysui/desktop/share/create_mime_xml.pl
+++ b/sysui/desktop/share/create_mime_xml.pl
@@ -99,7 +99,7 @@ sub getMimedata {
     $desktop_file = $mimedir.'/'.$desktop_name.'.desktop';
     $mimetype = "";
     $glob = "";
-    open(DESKTOP_FILE, $desktop_file) || die 'Cannot open "desktop"-file.'.$!;
+    open(DESKTOP_FILE, $desktop_file) || die "Cannot open desktop-file $desktop_file. ".$!;
     while (<DESKTOP_FILE>) {
         ## get mimetype
         if (/^MimeType=/) {
commit b1686f6cf1a52d53b46f1483e8a79dda0ccea797
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 24 18:37:41 2016 +0200

    tdf#103448 remove WPS Office exts. from MIME types
    
    Change-Id: I99e199ba0dd703703f0feafeb1a9b6970507050d

diff --git a/sysui/desktop/mimetypes/ms-excel-sheet.desktop b/sysui/desktop/mimetypes/ms-excel-sheet.desktop
index 52c02a7..6f81077 100644
--- a/sysui/desktop/mimetypes/ms-excel-sheet.desktop
+++ b/sysui/desktop/mimetypes/ms-excel-sheet.desktop
@@ -22,6 +22,5 @@ Hidden=false
 Icon=
 Type=MimeType
 Patterns=*.xls
-Patterns=*.et
 MimeType=application/vnd.ms-excel
 Comment=Microsoft Excel Worksheet
diff --git a/sysui/desktop/mimetypes/ms-excel-template-12.desktop b/sysui/desktop/mimetypes/ms-excel-template-12.desktop
index 4499524..2b4a0f2 100644
--- a/sysui/desktop/mimetypes/ms-excel-template-12.desktop
+++ b/sysui/desktop/mimetypes/ms-excel-template-12.desktop
@@ -22,6 +22,5 @@ Hidden=false
 Icon=
 Type=MimeType
 Patterns=*.xltm
-Patterns=*.ett
 MimeType=application/vnd.ms-excel.template.macroenabled.12
 Comment=Microsoft Excel Worksheet Template
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop b/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop
index 60afd56..43da8c3 100644
--- a/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop
+++ b/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop
@@ -22,6 +22,5 @@ Hidden=false
 Icon=
 Type=MimeType
 Patterns=*.ppt
-Patterns=*.dps
 MimeType=application/vnd.ms-powerpoint
 Comment=Microsoft PowerPoint Presentation
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop b/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop
index 0b14170..a03a431 100644
--- a/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop
+++ b/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop
@@ -22,6 +22,5 @@ Hidden=false
 Icon=
 Type=MimeType
 Patterns=*.potm
-Patterns=*.dpt
 MimeType=application/vnd.ms-powerpoint.template.macroenabled.12
 Comment=Microsoft PowerPoint Presentation Template
diff --git a/sysui/desktop/mimetypes/ms-word-document.desktop b/sysui/desktop/mimetypes/ms-word-document.desktop
index 756d21b..e4c3ee4 100644
--- a/sysui/desktop/mimetypes/ms-word-document.desktop
+++ b/sysui/desktop/mimetypes/ms-word-document.desktop
@@ -22,6 +22,5 @@ Hidden=false
 Icon=
 Type=MimeType
 Patterns=*.doc
-Patterns=*.wps
 MimeType=application/msword
 Comment=Microsoft Word Document
diff --git a/sysui/desktop/mimetypes/ms-word-template-12.desktop b/sysui/desktop/mimetypes/ms-word-template-12.desktop
index 1c6e25a..f16852a 100644
--- a/sysui/desktop/mimetypes/ms-word-template-12.desktop
+++ b/sysui/desktop/mimetypes/ms-word-template-12.desktop
@@ -22,6 +22,5 @@ Hidden=false
 Icon=
 Type=MimeType
 Patterns=*.dotm
-Patterns=*.wpt
 MimeType=application/vnd.ms-word.template.macroenabled.12
 Comment=Microsoft Word Document Template