[rkward-cvs] [rkward] rkward: merged MIME type definitions into one file. it is now also vendor specific which should shield it against collisions with other packages.

[m.eik michalke]

Git commit 82f02f335647ffa3184bc8d259fccff9d4f5c74d by m.eik michalke.
Committed on 28/11/2014 at 11:22.
Pushed by meikm into branch 'master'.

merged MIME type definitions into one file. it is now also vendor specific which should shield it against collisions with other packages.

M  +1    -1    rkward/CMakeLists.txt
D  +0    -12   rkward/r.xml
R  +9    -0    rkward/vnd.rkward.r.xml [from: rkward/rdata.xml - 062% similarity]

http://commits.kde.org/rkward/82f02f335647ffa3184bc8d259fccff9d4f5c74d

diff --git a/rkward/CMakeLists.txt b/rkward/CMakeLists.txt
index 6c8a3c2..5f77e4b 100644
--- a/rkward/CMakeLists.txt
+++ b/rkward/CMakeLists.txt
@@ -102,5 +102,5 @@ ELSE(Q_WS_MAC)
 ENDIF(Q_WS_MAC)
 
 INSTALL(FILES rkward.desktop rkward-open.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-INSTALL(FILES r.xml rdata.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
+INSTALL(FILES vnd.rkward.r.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
 INSTALL(FILES rkward.protocol DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/rkward/r.xml b/rkward/r.xml
deleted file mode 100644
index 1c6cd93..0000000
--- a/rkward/r.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="text/r">
-    <comment>R source file</comment>
-    <acronym>R</acronym>
-    <expanded-acronym>R programming language</expanded-acronym>
-    <generic-icon name="text-x-generic"/>
-    <sub-class-of type="text/plain"/>
-    <glob pattern="*.r"/>
-    <alias type="text/x-r"/>
-  </mime-type>
-</mime-info>
diff --git a/rkward/rdata.xml b/rkward/vnd.rkward.r.xml
similarity index 62%
rename from rkward/rdata.xml
rename to rkward/vnd.rkward.r.xml
index 724e180..9739385 100644
--- a/rkward/rdata.xml
+++ b/rkward/vnd.rkward.r.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="text/r">
+    <comment>R source file</comment>
+    <acronym>R</acronym>
+    <expanded-acronym>R programming language</expanded-acronym>
+    <generic-icon name="text-x-generic"/>
+    <sub-class-of type="text/plain"/>
+    <glob pattern="*.r"/>
+    <alias type="text/x-r"/>
+  </mime-type>
   <mime-type type="application/rdata">
     <comment>R data/workspace file</comment>
     <acronym>RData</acronym>