Partial revert of 1cfff1f624

This reverts icon naming and MIME type to unversioned x-kicad-* files.
We will attempt to maintain multiple versions through creative packaging

resources/linux/launchers/org.kicad.eeschema.desktop.in

@@ -5,7 +5,7 @@ Icon=eeschema
 Type=Application
 Categories=Science;Electronics;
 Exec=eeschema %f
-MimeType=application/x-kicad6-schematic;
+MimeType=application/x-kicad-schematic;
 Name=KiCad Schematic Editor (Standalone)
 GenericName=Schematic Capture Tool
 Comment=Standalone schematic editor for KiCad schematics

resources/linux/launchers/org.kicad.kicad.desktop.in

@@ -5,7 +5,7 @@ Icon=kicad
 Type=Application
 Categories=Science;Electronics;
 Exec=kicad %f
-MimeType=application/x-kicad6-project;
+MimeType=application/x-kicad-project;
 Name=KiCad
 GenericName=EDA Suite
 Comment=Suite of tools for schematic design and circuit board layout

resources/linux/launchers/org.kicad.pcbnew.desktop.in

@@ -5,7 +5,7 @@ Icon=pcbnew
 Type=Application
 Categories=Science;Electronics;
 Exec=pcbnew %f
-MimeType=application/x-kicad6-pcb;
+MimeType=application/x-kicad-pcb;
 Name=KiCad PCB Editor (Standalone)
 GenericName=PCB layout editor
 Comment=Standalone circuit board editor for KiCad boards

resources/linux/metainfo/org.kicad.kicad.metainfo.xml.in

@@ -22,9 +22,9 @@
         <binary>pcb_calculator</binary>
         <mediatype>application/x-gerber</mediatype>
         <mediatype>application/x-excellon</mediatype>
-        <mediatype>application/x-kicad6-project</mediatype>
+        <mediatype>application/x-kicad-project</mediatype>
-        <mediatype>application/x-kicad6-schematic</mediatype>
+        <mediatype>application/x-kicad-schematic</mediatype>
-        <mediatype>application/x-kicad6-pcb</mediatype>
+        <mediatype>application/x-kicad-pcb</mediatype>
     </provides>
 
     <translation type="gettext">kicad</translation>

resources/linux/mime/kicad-kicad.xml.in

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-    <mime-type type="application/x-kicad6-project">
+    <mime-type type="application/x-kicad-project">
         <sub-class-of type="text/plain"/>
-        <comment>KiCad 6 Project</comment>
+        <comment>KiCad Project</comment>
-        <generic-icon name="application-x-kicad6-project"/>
+        <generic-icon name="application-x-kicad-project"/>
         <glob pattern="*.pro" weight="40"/>
         <glob pattern="*.kicad_pro" weight="50"/>
     </mime-type>
-    <mime-type type="application/x-kicad6-schematic">
+    <mime-type type="application/x-kicad-schematic">
         <sub-class-of type="text/plain"/>
-        <comment>KiCad 6 Schematic</comment>
+        <comment>KiCad Schematic</comment>
-        <generic-icon name="application-x-kicad6-schematic"/>
+        <generic-icon name="application-x-kicad-schematic"/>
         <glob pattern="*.sch" weight="40"/>
         <glob pattern="*.kicad_sch" weight="50"/>
         <magic priority="50">
@@ -22,10 +22,10 @@
             <match type="string" offset="0" value="EESchema Schematic File"/>
         </magic>
     </mime-type>
-    <mime-type type="application/x-kicad6-pcb">
+    <mime-type type="application/x-kicad-pcb">
         <sub-class-of type="text/plain"/>
-        <comment>KiCad 6 Printed Circuit Board</comment>
+        <comment>KiCad Printed Circuit Board</comment>
-        <generic-icon name="application-x-kicad6-pcb"/>
+        <generic-icon name="application-x-kicad-pcb"/>
         <glob pattern="*.kicad_pcb" weight="50"/>
         <magic priority="50">
             <!--The new board file (.kicad_pcb) header-->