Updates for KDE/4.9

[marble] / packaging / debian / patches / maemo-startup-files.diff

diff --git a/packaging/debian/patches/maemo-startup-files.diff b/packaging/debian/patches/maemo-startup-files.diff
index 146f815..f13304f 100644 (file)
--- a/packaging/debian/patches/maemo-startup-files.diff
+++ b/packaging/debian/patches/maemo-startup-files.diff
@@ -1,8 +1,8 @@
-Index: marble-1.1.90/src/CMakeLists.txt
+Index: src-fremantle/src/CMakeLists.txt
 ===================================================================
---- marble-1.1.90.orig/src/CMakeLists.txt      2011-06-21 18:34:08.000000000 +0200
-+++ marble-1.1.90/src/CMakeLists.txt   2011-06-22 18:49:32.000000000 +0200
-@@ -202,3 +202,12 @@
+--- src-fremantle.orig/src/CMakeLists.txt      2012-08-12 12:53:12.000000000 +0200
++++ src-fremantle/src/CMakeLists.txt   2012-08-12 12:53:42.000000000 +0200
+@@ -233,3 +233,12 @@
    ${CMAKE_CURRENT_SOURCE_DIR}/config-marble.h.cmake
    ${CMAKE_CURRENT_BINARY_DIR}/config-marble.h
  )
@@ -15,10 +15,10 @@ Index: marble-1.1.90/src/CMakeLists.txt
 +  ${CMAKE_INSTALL_PREFIX}/../../usr/share/applications/hildon/ )
 +install ( FILES marble.service DESTINATION
 +  ${CMAKE_INSTALL_PREFIX}/../../usr/share/dbus-1/services/ )
-Index: marble-1.1.90/src/marble.desktop
+Index: src-fremantle/src/marble.desktop
 ===================================================================
---- marble-1.1.90.orig/src/marble.desktop      2011-06-21 18:34:08.000000000 +0200
-+++ marble-1.1.90/src/marble.desktop   2011-06-22 18:49:32.000000000 +0200
+--- src-fremantle.orig/src/marble.desktop      2012-08-12 12:53:12.000000000 +0200
++++ src-fremantle/src/marble.desktop   2012-08-12 12:53:42.000000000 +0200
 @@ -1,7 +1,6 @@
  [Desktop Entry]
  Type=Application
@@ -28,7 +28,7 @@ Index: marble-1.1.90/src/marble.desktop
  Name=Marble
  Name[ast]=Marble
  Name[bg]=Marble
-@@ -111,5 +110,9 @@
+@@ -116,5 +115,9 @@
  GenericName[zh_TW]=桌面星象儀
  Icon=marble
  Terminal=false
@@ -39,10 +39,10 @@ Index: marble-1.1.90/src/marble.desktop
 +X-HildonDesk-ShowInToolbar=true
 +X-Osso-Service=org.kde.edu.marble
 +X-Osso-Type=application/x-executable
-Index: marble-1.1.90/src/marble.sh
+Index: src-fremantle/src/marble.sh
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ marble-1.1.90/src/marble.sh        2011-06-22 18:49:32.000000000 +0200
++++ src-fremantle/src/marble.sh        2012-08-12 12:53:42.000000000 +0200
 @@ -0,0 +1,21 @@
 +#!/bin/sh
 +
@@ -65,29 +65,27 @@ Index: marble-1.1.90/src/marble.sh
 +export PATH
 +
 +/opt/marble/bin/marble $*
-Index: marble-1.1.90/src/marble.service
+Index: src-fremantle/src/marble.service
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ marble-1.1.90/src/marble.service   2011-06-22 18:49:32.000000000 +0200
++++ src-fremantle/src/marble.service   2012-08-12 12:53:42.000000000 +0200
 @@ -0,0 +1,3 @@
 +[D-BUS Service]
 +Name=org.kde.edu.marble
 +Exec=/opt/marble/bin/marble.sh
-Index: marble-1.1.90/data/CMakeLists.txt
+Index: src-fremantle/data/CMakeLists.txt
 ===================================================================
---- marble-1.1.90.orig/data/CMakeLists.txt     2011-06-21 18:34:08.000000000 +0200
-+++ marble-1.1.90/data/CMakeLists.txt  2011-06-22 18:49:32.000000000 +0200
-@@ -249,11 +249,12 @@
+--- src-fremantle.orig/data/CMakeLists.txt     2012-08-12 12:53:12.000000000 +0200
++++ src-fremantle/data/CMakeLists.txt  2012-08-12 13:18:38.000000000 +0200
+@@ -253,10 +253,10 @@
+ endif(MOBILE)
  
  if(NOT APPLE AND NOT WIN32)
-   if(QTONLY)
--    set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
-+    set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/../../usr/share/icons)
-   endif(QTONLY)
-     install (FILES icons/hi128-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/128x128/apps/ RENAME marble.png)
-     install (FILES icons/hi64-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/64x64/apps/ RENAME marble.png)
-     install (FILES icons/hi48-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/48x48/apps/ RENAME marble.png)
-+    install (FILES icons/hi32-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/26x26/apps/ RENAME marble.png)
-     install (FILES icons/hi32-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/32x32/apps/ RENAME marble.png)
-     install (FILES icons/hi22-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/22x22/apps/ RENAME marble.png)
-     install (FILES icons/hi16-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/16x16/apps/ RENAME marble.png)
+-  install (FILES icons/hi128-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/128x128/apps/ RENAME marble.png)
+   install (FILES icons/hi64-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/64x64/apps/ RENAME marble.png)
+   install (FILES icons/hi48-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/48x48/apps/ RENAME marble.png)
+   install (FILES icons/hi32-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/32x32/apps/ RENAME marble.png)
++  install (FILES icons/hi32-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/26x26/apps/ RENAME marble.png)
+   install (FILES icons/hi22-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/22x22/apps/ RENAME marble.png)
+   install (FILES icons/hi16-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/16x16/apps/ RENAME marble.png)
+ endif(NOT APPLE AND NOT WIN32 )