vcs.maemo.org Git - marble/blob - packaging/debian/patches/maemo-startup-files.diff

   1 Index: marble-0.85+svn1207808/src/CMakeLists.txt
   2 ===================================================================
   3 --- marble-0.85+svn1207808.orig/src/CMakeLists.txt      2010-12-19 13:16:39.000000000 -0500
   4 +++ marble-0.85+svn1207808/src/CMakeLists.txt   2010-12-19 15:03:25.000000000 -0500
   5 @@ -202,3 +202,12 @@
   6    ${CMAKE_CURRENT_SOURCE_DIR}/config-marble.h.cmake
   7    ${CMAKE_CURRENT_BINARY_DIR}/config-marble.h
   8  )
   9 +
  10 +install ( FILES marble.sh DESTINATION bin/ PERMISSIONS
  11 +  OWNER_EXECUTE OWNER_WRITE OWNER_READ
  12 +  GROUP_EXECUTE GROUP_READ
  13 +  WORLD_READ WORLD_EXECUTE)
  14 +install ( FILES marble.desktop DESTINATION
  15 +  ${CMAKE_INSTALL_PREFIX}/../../usr/share/applications/hildon/ )
  16 +install ( FILES marble.service DESTINATION
  17 +  ${CMAKE_INSTALL_PREFIX}/../../usr/share/dbus-1/services/ )
  18 Index: marble-0.85+svn1207808/src/marble.desktop
  19 ===================================================================
  20 --- marble-0.85+svn1207808.orig/src/marble.desktop      2010-12-19 13:16:18.000000000 -0500
  21 +++ marble-0.85+svn1207808/src/marble.desktop   2010-12-19 13:16:32.000000000 -0500
  22 @@ -1,7 +1,6 @@
  23  [Desktop Entry]
  24  Type=Application
  25 -TryExec=marble
  26 -Exec=marble
  27 +Exec=/opt/marble/bin/marble.sh
  28  Name=Marble
  29  Name[ast]=Marble
  30  Name[bg]=Marble
  31 @@ -108,5 +107,9 @@
  32  GenericName[zh_TW]=桌面星象儀
  33  Icon=marble
  34  Terminal=false
  35 -Categories=Qt;KDE;Education;Geography;
  36 +StartupWMClass=marble
  37 +X-Window-Icon=marble
  38  X-DocPath=marble/index.html
  39 +X-HildonDesk-ShowInToolbar=true
  40 +X-Osso-Service=org.kde.edu.marble
  41 +X-Osso-Type=application/x-executable
  42 Index: marble-0.85+svn1207808/src/marble.sh
  43 ===================================================================
  44 --- /dev/null   1970-01-01 00:00:00.000000000 +0000
  45 +++ marble-0.85+svn1207808/src/marble.sh        2010-12-19 13:19:17.000000000 -0500
  46 @@ -0,0 +1,21 @@
  47 +#!/bin/sh
  48 +
  49 +# Set the environment variable XDG_DATA_HOME to have
  50 +# marble store cached data in /home/user/MyDocs/marble/data
  51 +# Can be overridden by specifying an alternative path in
  52 +# the environment variable MARBLE_DATA_HOME, e.g.
  53 +# $ export MARBLE_DATA_HOME=/home/user
  54 +# which would result in cached data being written to
  55 +# /home/user/marble/data.
  56 +XDG_DATA_HOME="${MARBLE_DATA_HOME:-/home/user/MyDocs/.local/share}"
  57 +export XDG_DATA_HOME
  58 +
  59 +# Marble is installed in /opt/marble. Add it's library
  60 +# to the library search path.
  61 +LD_LIBRARY_PATH="/opt/marble/lib:${LD_LIBRARY_PATH}"
  62 +export LD_LIBRARY_PATH
  63 +
  64 +PATH="/opt/marble/bin:${PATH}"
  65 +export PATH
  66 +
  67 +/opt/marble/bin/marble $*
  68 Index: marble-0.85+svn1207808/src/marble.service
  69 ===================================================================
  70 --- /dev/null   1970-01-01 00:00:00.000000000 +0000
  71 +++ marble-0.85+svn1207808/src/marble.service   2010-12-19 15:03:43.000000000 -0500
  72 @@ -0,0 +1,3 @@
  73 +[D-BUS Service]
  74 +Name=org.kde.edu.marble
  75 +Exec=/opt/marble/bin/marble.sh
  76 Index: marble-0.85+svn1207808/data/CMakeLists.txt
  77 ===================================================================
  78 --- marble-0.85+svn1207808.orig/data/CMakeLists.txt     2010-12-19 15:06:33.000000000 -0500
  79 +++ marble-0.85+svn1207808/data/CMakeLists.txt  2010-12-19 15:54:14.000000000 -0500
  80 @@ -231,11 +231,12 @@
  81
  82  if(NOT APPLE AND NOT WIN32)
  83    if(QTONLY)
  84 -    set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
  85 +    set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/../../usr/share/icons)
  86    endif(QTONLY)
  87      install (FILES icons/hi128-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/128x128/apps/ RENAME marble.png)
  88      install (FILES icons/hi64-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/64x64/apps/ RENAME marble.png)
  89      install (FILES icons/hi48-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/48x48/apps/ RENAME marble.png)
  90 +    install (FILES icons/hi32-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/26x26/apps/ RENAME marble.png)
  91      install (FILES icons/hi32-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/32x32/apps/ RENAME marble.png)
  92      install (FILES icons/hi22-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/22x22/apps/ RENAME marble.png)
  93      install (FILES icons/hi16-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/16x16/apps/ RENAME marble.png)