r2898 - packages/trunk/cultivation/debian/patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-06-09 16:34:27 +0000 (Sat, 09 Jun 2007)
New Revision: 2898

Modified:
   packages/trunk/cultivation/debian/patches/abs_paths.patch
   packages/trunk/cultivation/debian/patches/series
Log:
Abs paths



Modified: packages/trunk/cultivation/debian/patches/abs_paths.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/abs_paths.patch	2007-06-09 16:13:05 UTC (rev 2897)
+++ packages/trunk/cultivation/debian/patches/abs_paths.patch	2007-06-09 16:34:27 UTC (rev 2898)
@@ -1,5 +1,5 @@
---- cultivation-7.20061227.orig/game2/gameSource/game.cpp
-+++ cultivation-7.20061227/game2/gameSource/game.cpp
+--- cultivation-7.20061227.dfsg1.orig/game2/gameSource/game.cpp
++++ cultivation-7.20061227.dfsg1/game2/gameSource/game.cpp
 @@ -43,6 +43,8 @@
  #include <time.h>
  
@@ -9,16 +9,17 @@
  #include "minorGems/graphics/openGL/ScreenGL.h"
  #include "minorGems/graphics/openGL/SceneHandlerGL.h"
  #include "minorGems/graphics/Color.h"
-@@ -897,7 +899,7 @@
+@@ -897,7 +899,8 @@
      // load font image
      TGAImageConverter tga;
  
 -    File fontFile( NULL, "font.tga" );
-+    File fontFile( NULL, DATADIR "/font.tga" );
++    Path fontPath( DATADIR );
++    File fontFile( &fontPath, "font.tga" );
      FileInputStream fontInput( &fontFile );
  
      Image *fontImage = tga.deformatImage( &fontInput );
-@@ -980,7 +982,8 @@
+@@ -980,7 +983,8 @@
      mCurrentTipStoredItem = -1;
      
      // translation language for tool tips
@@ -28,7 +29,7 @@
  
      if( languageNameFile.exists() ) {
          char *languageNameText = languageNameFile.readFileContents();
-@@ -993,6 +996,7 @@
+@@ -993,6 +997,7 @@
          if( numTokens > 0 ) {
              char *languageName = *( tokens->getElement( 0 ) );
          
@@ -36,8 +37,8 @@
              TranslationManager::setLanguage( languageName );
              }
          else {
---- cultivation-7.20061227.orig/game2/gameSource/features.cpp
-+++ cultivation-7.20061227/game2/gameSource/features.cpp
+--- cultivation-7.20061227.dfsg1.orig/game2/gameSource/features.cpp
++++ cultivation-7.20061227.dfsg1/game2/gameSource/features.cpp
 @@ -7,6 +7,7 @@
  
  
@@ -55,8 +56,8 @@
  
      char stringBuffer[100];
      int switchValue;
---- cultivation-7.20061227.orig/game2/gameSource/defs.h
-+++ cultivation-7.20061227/game2/gameSource/defs.h
+--- cultivation-7.20061227.dfsg1.orig/game2/gameSource/defs.h
++++ cultivation-7.20061227.dfsg1/game2/gameSource/defs.h
 @@ -0,0 +1,8 @@
 +#ifndef DEFS_INCLUDED
 +#define DEFS_INCLUDED

Modified: packages/trunk/cultivation/debian/patches/series
===================================================================
--- packages/trunk/cultivation/debian/patches/series	2007-06-09 16:13:05 UTC (rev 2897)
+++ packages/trunk/cultivation/debian/patches/series	2007-06-09 16:34:27 UTC (rev 2898)
@@ -1,4 +1,4 @@
 build.patch
-abs_paths.patch
 portaudio.patch
 cflags.patch
+abs_paths.patch
\ No newline at end of file