From a5a68d2a86b1bde9444cc29f052ee12eb65be527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Mon, 10 May 2010 16:13:38 +0200
Subject: [PATCH 1/2] update desktop file to recent standards

---
 desktop/mm3d.desktop | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/desktop/mm3d.desktop b/desktop/mm3d.desktop
index 8c52ac9..695e68b 100644
--- a/desktop/mm3d.desktop
+++ b/desktop/mm3d.desktop
@@ -1,14 +1,10 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Exec=mm3d %U
 Icon=mm3d
-DocPath=mm3d/index.html
 GenericName=3D Modeler
 Comment=3D modeling program
 Terminal=false
 Name=Maverick Model 3D
-MimeType=application/x-mm3d
-Categories=Qt;Application;Graphics;
-X-AppInstall-Package=mm3d
-X-AppInstall-Section=universe
+MimeType=application/x-mm3d;
+Categories=Qt;Graphics;3DGraphics;
-- 
2.17.2

From 3ba73e16940a574f131c5120d238d92c0aee06b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Mon, 10 May 2010 16:40:27 +0200
Subject: [PATCH 2/2] switch to modern mime information

---
 desktop/Makefile.am    | 7 +++----
 desktop/mm3d.xml       | 8 ++++++++
 desktop/x-mm3d.desktop | 7 -------
 3 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 desktop/mm3d.xml
 delete mode 100644 desktop/x-mm3d.desktop

diff --git a/desktop/Makefile.am b/desktop/Makefile.am
index 1c80082..1ae0180 100644
--- a/desktop/Makefile.am
+++ b/desktop/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = \
 	mm3d.desktop \
-	x-mm3d.desktop \
+	mm3d.xml \
 	mm3d.png \
 	mm3d-32.xpm \
 	mm3d-16.xpm
@@ -9,11 +9,10 @@ all:
 
 install:
 	$(INSTALL) -d $(DESTDIR)$(datadir)/applications/
-	$(INSTALL) -d $(DESTDIR)$(datadir)/mimelnk/application/
+	$(INSTALL) -d $(DESTDIR)$(datadir)/mime/packages/
 	$(INSTALL) -d $(DESTDIR)$(datadir)/pixmaps/
 	${INSTALL} -m 0644 $(srcdir)/mm3d.desktop $(DESTDIR)$(datadir)/applications/
-	${INSTALL} -m 0644 $(srcdir)/x-mm3d.desktop $(DESTDIR)$(datadir)/mimelnk/application/
+	${INSTALL} -m 0644 $(srcdir)/mm3d.xml $(DESTDIR)$(datadir)/mime/packages/
 	${INSTALL} -m 0644 $(srcdir)/mm3d.png $(DESTDIR)$(datadir)/pixmaps/
 	${INSTALL} -m 0644 $(srcdir)/mm3d-32.xpm $(DESTDIR)$(datadir)/pixmaps/
 	${INSTALL} -m 0644 $(srcdir)/mm3d-16.xpm $(DESTDIR)$(datadir)/pixmaps/
-
diff --git a/desktop/mm3d.xml b/desktop/mm3d.xml
new file mode 100644
index 0000000..84910c8
--- /dev/null
+++ b/desktop/mm3d.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-mm3d">
+    <comment>mm3d model</comment>
+    <glob pattern="*.mm3d"/>
+    <glob pattern="*.MM3D"/>
+  </mime-type>
+</mime-info>
diff --git a/desktop/x-mm3d.desktop b/desktop/x-mm3d.desktop
deleted file mode 100644
index cb5250c..0000000
--- a/desktop/x-mm3d.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Comment=mm3d model
-Type=MimeType
-MimeType=application/x-mm3d
-Icon=mm3d
-Patterns=*.mm3d;*.MM3D
-- 
2.17.2