Permalink
Browse files

diaspora: 1.0.4-1~getdeb4

  * The problem is still not fixed (LP: #1130659)
  * debian/patches/resources_path.patch: Just hardcode the resources
    directory.
  • Loading branch information...
1 parent 7874af1 commit 183fbca2bca876cce4cdb0cc705df65196fc7d27 Christoph Korn committed Feb 20, 2013
Showing with 36 additions and 0 deletions.
  1. +8 −0 diaspora/changelog
  2. +1 −0 diaspora/diaspora.install
  3. +26 −0 diaspora/patches/resources_path.patch
  4. +1 −0 diaspora/patches/series
View
8 diaspora/changelog
@@ -1,3 +1,11 @@
+diaspora (1.0.4-1~getdeb4) precise; urgency=low
+
+ * The problem is still not fixed (LP: #1130659)
+ * debian/patches/resources_path.patch: Just hardcode the resources
+ directory.
+
+ -- Christoph Korn <christoph.korn@getdeb.net> Wed, 20 Feb 2013 19:14:17 +0100
+
diaspora (1.0.4-1~getdeb3) precise; urgency=low
* debian/rules: Make the wxlauncher with
View
1 diaspora/diaspora.install
@@ -1,4 +1,5 @@
Diaspora/wxlauncher/build/wxlauncher usr/lib/games/diaspora
+Diaspora/wxlauncher/resources usr/share/games/diaspora
Diaspora/fs2_open_diaspora usr/lib/games/diaspora
debian/scripts/diaspora usr/games
debian/diaspora.png usr/share/pixmaps
View
26 diaspora/patches/resources_path.patch
@@ -0,0 +1,26 @@
+## Description: When developing is active the game looks in the build dir for
+## the files. Just hardcode the correct directory for the package.
+## Origin/Author: Christoph Korn <christoph.korn@getdeb.net>
+## Bug: this is not an upstream bug
+Index: diaspora-1.0.4/Diaspora/wxlauncher/CMakeLists.txt
+===================================================================
+--- diaspora-1.0.4.orig/Diaspora/wxlauncher/CMakeLists.txt 2013-02-20 19:48:55.000000000 +0100
++++ diaspora-1.0.4/Diaspora/wxlauncher/CMakeLists.txt 2013-02-20 19:50:15.887884465 +0100
+@@ -58,7 +58,7 @@
+ option(DEVELOPMENT_MODE "Doing development (cannot build installer in this mode)" OFF)
+ if(DEVELOPMENT_MODE)
+ set(HELP_HTB_LOCATION ${helphtblocation})
+- set(RESOURCES_PATH ${PROJECT_SOURCE_DIR}/resources)
++ set(RESOURCES_PATH /usr/share/games/diaspora/resources)
+ else(DEVELOPMENT_MODE)
+ if (NOT DEFINED RESOURCES_PATH)
+ if(IS_WIN32)
+@@ -66,7 +66,7 @@
+ elseif(IS_APPLE)
+ set(RESOURCES_PATH wxlauncher.app/Contents/Resources)
+ else()
+- set(RESOURCES_PATH /usr/local/share/wxlauncher/)
++ set(RESOURCES_PATH /usr/share/games/diaspora/resources)
+ endif()
+ endif()
+ set(HELP_HTB_LOCATION ${RESOURCES_PATH}/onlinehelp.htb)
View
1 diaspora/patches/series
@@ -1,3 +1,4 @@
ftbfs.patch
wxlauncher_homedir.patch
typos.patch
+resources_path.patch

0 comments on commit 183fbca

Please sign in to comment.