r2888 - in packages/trunk/cultivation/debian: . patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-06-08 22:27:47 +0000 (Fri, 08 Jun 2007)
New Revision: 2888

Added:
   packages/trunk/cultivation/debian/patches/abs_paths.patch
Modified:
   packages/trunk/cultivation/debian/patches/series
   packages/trunk/cultivation/debian/rules
Log:
Patch for absolute directories



Added: packages/trunk/cultivation/debian/patches/abs_paths.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/abs_paths.patch	                        (rev 0)
+++ packages/trunk/cultivation/debian/patches/abs_paths.patch	2007-06-08 22:27:47 UTC (rev 2888)
@@ -0,0 +1,68 @@
+--- cultivation-7.20061227.orig/game2/gameSource/game.cpp
++++ cultivation-7.20061227/game2/gameSource/game.cpp
+@@ -43,6 +43,8 @@
+ #include <time.h>
+ 
+ 
++#include "defs.h"
++
+ #include "minorGems/graphics/openGL/ScreenGL.h"
+ #include "minorGems/graphics/openGL/SceneHandlerGL.h"
+ #include "minorGems/graphics/Color.h"
+@@ -897,7 +899,7 @@
+     // load font image
+     TGAImageConverter tga;
+ 
+-    File fontFile( NULL, "font.tga" );
++    File fontFile( NULL, DATADIR "/font.tga" );
+     FileInputStream fontInput( &fontFile );
+ 
+     Image *fontImage = tga.deformatImage( &fontInput );
+@@ -980,7 +982,8 @@
+     mCurrentTipStoredItem = -1;
+     
+     // translation language for tool tips
+-    File languageNameFile( NULL, "language.txt" );
++    Path languagePath( DATADIR );
++    File languageNameFile( &languagePath, "language.txt" );
+ 
+     if( languageNameFile.exists() ) {
+         char *languageNameText = languageNameFile.readFileContents();
+@@ -993,6 +996,7 @@
+         if( numTokens > 0 ) {
+             char *languageName = *( tokens->getElement( 0 ) );
+         
++            TranslationManager::setDirectoryName( DATADIR "/languages" );
+             TranslationManager::setLanguage( languageName );
+             }
+         else {
+--- cultivation-7.20061227.orig/game2/gameSource/features.cpp
++++ cultivation-7.20061227/game2/gameSource/features.cpp
+@@ -7,6 +7,7 @@
+ 
+ 
+ 
++#include "defs.h"
+ #include "features.h"
+ 
+ #include "minorGems/io/file/File.h"
+@@ -57,7 +58,7 @@
+ 
+ 
+ void initializeFeatures() {
+-    FILE *featuresFile = fopen( "features.txt", "r" );
++    FILE *featuresFile = fopen( DATADIR "/features.txt", "r" );
+ 
+     char stringBuffer[100];
+     int switchValue;
+--- cultivation-7.20061227.orig/game2/gameSource/defs.h
++++ cultivation-7.20061227/game2/gameSource/defs.h
+@@ -0,0 +1,8 @@
++#ifndef DEFS_INCLUDED
++#define DEFS_INCLUDED
++
++#ifndef DATADIR
++#define DATADIR "."
++#endif
++
++#endif

Modified: packages/trunk/cultivation/debian/patches/series
===================================================================
--- packages/trunk/cultivation/debian/patches/series	2007-06-08 20:26:10 UTC (rev 2887)
+++ packages/trunk/cultivation/debian/patches/series	2007-06-08 22:27:47 UTC (rev 2888)
@@ -1 +1,2 @@
-build.patch
\ No newline at end of file
+build.patch
+abs_paths.patch

Modified: packages/trunk/cultivation/debian/rules
===================================================================
--- packages/trunk/cultivation/debian/rules	2007-06-08 20:26:10 UTC (rev 2887)
+++ packages/trunk/cultivation/debian/rules	2007-06-08 22:27:47 UTC (rev 2888)
@@ -69,7 +69,7 @@
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
-	dh_installman
+	dh_installman debian/cultivation.6
 	dh_link
 	dh_strip
 	dh_compress