Merge pull request #7 from fayvel/mime

gen2brain · gen2brain · commit 0706e30608cb · 2014-09-20T18:51:21.000+02:00
Don't installing conflicting mime type for *.*64
diff --git a/setup.py b/setup.py
@@ -320,8 +320,5 @@ def run(self):
     data_files = [
         ("share/pixmaps", ["xdg/m64py.png"]),
         ("share/applications", ["xdg/m64py.desktop"]),
-        ("share/mime/packages", ["xdg/application-x-m64py.xml"]),
-        ("share/icons/hicolor/96x96/mimetypes/application-x-m64py.png",
-            ["xdg/application-x-m64py.xml"])
     ]
 )
diff --git a/xdg/application-x-m64py.xml b/xdg/application-x-m64py.xml
diff --git a/xdg/m64py.desktop b/xdg/m64py.desktop
@@ -6,5 +6,5 @@ Type=Application
 Icon=m64py
 Comment=A frontend for Mupen64Plus
 Categories=Game;Emulator;
-MimeType=application/x-m64py;
+MimeType=application/x-n64-rom;
 Keywords=Emulator;Nintendo64;Mupen64plus;

Original file line number	Diff line number	Diff line change
`@@ -320,8 +320,5 @@ def run(self):`
`320`	`320`	`data_files = [`
`321`	`321`	`("share/pixmaps", ["xdg/m64py.png"]),`
`322`	`322`	`("share/applications", ["xdg/m64py.desktop"]),`
`323`		`- ("share/mime/packages", ["xdg/application-x-m64py.xml"]),`
`324`		`- ("share/icons/hicolor/96x96/mimetypes/application-x-m64py.png",`
`325`		`- ["xdg/application-x-m64py.xml"])`
`326`	`323`	`]`
`327`	`324`	`)`