[planetblupi] 15/61: Fix deploy of desktop file with non-appimage builds

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 29ad6c30f4ff1011097abb206457c5038839a67d
Author: Mathieu Schroeter <mathieu at schroetersa.ch>
Date:   Sat Oct 21 09:51:54 2017 +0200

    Fix deploy of desktop file with non-appimage builds
---
 CMakeLists.txt                         | 6 ++++--
 resources/linux/application.desktop.in | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5d85b9..697fe7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,8 @@ set (PB_VERSION_PATCH 0)
 set (PB_VERSION_EXTRA "")
 set (PB_PRODUCT_NAME "Planet Blupi")
 set (PB_PACKAGE_NAME "planetblupi")
+set (PB_EXEC         "planetblupi")
+set (PB_ICON_REF     "blupi")
 set (PB_DESCRIPTION "Planet Blupi - A delirious spell-binding game")
 
 option (PB_HTTP_VERSION_CHECK "Run a version check over HTTP (with CURL)" OFF)
@@ -272,7 +274,7 @@ endif ()
 if (NOT USE_APPIMAGE)
   install (
     FILES ${CMAKE_CURRENT_BINARY_DIR}/${PB_PACKAGE_NAME}.desktop
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/
+    DESTINATION share/applications
   )
 endif ()
 
@@ -303,7 +305,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND "${STATIC_BUILD}")
   if (USE_APPIMAGE)
     include (LinuxAppImageBuild)
     set (CMAKE_PACKAGED_OUTPUT_PREFIX ${CMAKE_INSTALL_PREFIX})
-    APPIMAGE_PACKAGE (planetblupi ${PB_PACKAGE_NAME} ${PB_PRODUCT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/resources/linux" "${CMAKE_BINARY_DIR}/share" "" "" "blupi")
+    APPIMAGE_PACKAGE (planetblupi ${PB_PACKAGE_NAME} ${PB_PRODUCT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/resources/linux" "${CMAKE_BINARY_DIR}/share" "" "" ${PB_ICON_REF})
   elseif (MINGW)
     set (INSTALLER_FILE_NAME "${PB_PACKAGE_NAME}-${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}${PB_VERSION_EXTRA}")
     set (CPACK_PACKAGE_FILE_NAME "${INSTALLER_FILE_NAME}")
diff --git a/resources/linux/application.desktop.in b/resources/linux/application.desktop.in
index 78fb320..cda0397 100644
--- a/resources/linux/application.desktop.in
+++ b/resources/linux/application.desktop.in
@@ -3,8 +3,8 @@ Version=1.0
 Type=Application
 Name=@PB_PRODUCT_NAME@
 GenericName=Video Game
-Comment=@CPACK_PACKAGE_DESCRIPTION_SUMMARY@
-Exec=@APPIMAGE_EXEC@
-StartupWMClass=@APPIMAGE_EXEC_WM@
+Comment=@PB_DESCRIPTION@
+Exec=@PB_EXEC@
+StartupWMClass=@PB_EXEC@
 Icon=@APPIMAGE_ICON_REF@
 Categories=Game;StrategyGame;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/planetblupi.git