From bb7c262539a5b2b663bbec065e9120fa9fb21e46 Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Mon, 7 Jan 2013 16:50:48 -0600
Subject: [PATCH 1/2] Add a linux .desktop file to add dolphin-emu to the menu,
 and install it when running 'make install'.

---
 CMakeLists.txt                                      | 7 +++++++
 Source/Core/DolphinWX/resources/dolphin-emu.desktop | 9 +++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 Source/Core/DolphinWX/resources/dolphin-emu.desktop

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b025de11ef..5f36e1f8a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -622,6 +622,13 @@ endif()
 if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin"))
 	install(FILES Data/license.txt DESTINATION ${datadir})
 endif()
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	# Install the application icon and menu item
+	install(FILES Source/Core/DolphinWX/resources/Dolphin.xpm
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME dolphin-emu.xpm)
+	install(FILES Source/Core/DolphinWX/resources/dolphin-emu.desktop
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+endif()
 
 # packaging information
 set(CPACK_PACKAGE_NAME "dolphin-emu")
diff --git a/Source/Core/DolphinWX/resources/dolphin-emu.desktop b/Source/Core/DolphinWX/resources/dolphin-emu.desktop
new file mode 100644
index 0000000000..0ce4678f00
--- /dev/null
+++ b/Source/Core/DolphinWX/resources/dolphin-emu.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Dolphin-emu
+Comment=A Wii/GameCube Emulator
+Icon=dolphin-emu
+Exec=dolphin-emu
+Categories=Game;
+

From 6bd8474d054db7eafa546063e88f23e7ffe0d9d0 Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Mon, 7 Jan 2013 17:05:51 -0600
Subject: [PATCH 2/2] Change the application name to "Dolphin Emulator" (from
 "Dolphin-emu").

---
 Source/Core/DolphinWX/resources/dolphin-emu.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/resources/dolphin-emu.desktop b/Source/Core/DolphinWX/resources/dolphin-emu.desktop
index 0ce4678f00..f201f07f22 100644
--- a/Source/Core/DolphinWX/resources/dolphin-emu.desktop
+++ b/Source/Core/DolphinWX/resources/dolphin-emu.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=Dolphin-emu
+Name=Dolphin Emulator
 Comment=A Wii/GameCube Emulator
 Icon=dolphin-emu
 Exec=dolphin-emu