Blob Blame Raw
From 434083d5647ae052693eff559acbd08de09cbc37 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Sun, 11 May 2014 22:58:04 +0400
Subject: [PATCH 1/6] fix .desktop file and install destinations

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
 CMakeLists.txt                     |  7 +++----
 data/supertuxkart.desktop          | 13 +++++++++++++
 data/supertuxkart_desktop.template | 14 --------------
 3 files changed, 16 insertions(+), 18 deletions(-)
 create mode 100644 data/supertuxkart.desktop
 delete mode 100644 data/supertuxkart_desktop.template

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09edd58..2d87a98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -292,9 +292,8 @@ endif()
 # ==== Install target ====
 install(TARGETS supertuxkart RUNTIME DESTINATION ${STK_INSTALL_BINARY_DIR} BUNDLE DESTINATION .)
 install(DIRECTORY ${STK_DATA_DIR} DESTINATION ${STK_INSTALL_DATA_DIR} PATTERN ".svn" EXCLUDE)
-install(FILES ${PROJECT_BINARY_DIR}/supertuxkart.desktop DESTINATION share/applications)
-install(FILES data/supertuxkart_32.png data/supertuxkart_128.png DESTINATION share/pixmaps)
+install(FILES data/supertuxkart.desktop DESTINATION share/applications)
+install(FILES data/supertuxkart_32.png DESTINATION share/icons/hicolor/32x32/apps RENAME supertuxkart.png)
+install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128/apps RENAME supertuxkart.png)
 
 set(PREFIX ${CMAKE_INSTALL_PREFIX})
-configure_file(data/supertuxkart_desktop.template supertuxkart.desktop)
-add_dependencies(supertuxkart supertuxkart.desktop)
diff --git a/data/supertuxkart.desktop b/data/supertuxkart.desktop
new file mode 100644
index 0000000..5fd69ee
--- /dev/null
+++ b/data/supertuxkart.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=SuperTuxKart
+Icon=supertuxkart
+GenericName=A kart racing game
+GenericName[de_DE]=Ein Kart-Rennspiel
+GenericName[fr_FR]=Un jeu de karting
+GenericName[gl]=Xogo de carreiras con karts
+GenericName[ro_RO]=Un joc de curse cu carturi
+Exec=supertuxkart-wrapper --no-console
+Terminal=false
+StartupNotify=false
+Type=Application
+Categories=Game;ActionGame;ArcadeGame;
diff --git a/data/supertuxkart_desktop.template b/data/supertuxkart_desktop.template
deleted file mode 100644
index aeb48ab..0000000
--- a/data/supertuxkart_desktop.template
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=SuperTuxKart
-Icon=@PREFIX@/share/pixmaps/supertuxkart_128.png
-GenericName=A kart racing game
-GenericName[de_DE]=Ein Kart-Rennspiel
-GenericName[fr_FR]=Un jeu de karting
-GenericName[gl]=Xogo de carreiras con karts
-GenericName[ro_RO]=Un joc de curse cu carturi
-Exec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart --no-console
-Terminal=false
-StartupNotify=false
-Type=Application
-TryExec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart
-Categories=Game;ArcadeGame;
-- 
1.9.3