diff options
| author | Dmitry Smirnov <onlyjob@member.fsf.org> | 2013-08-04 05:49:48 +1000 |
|---|---|---|
| committer | Dmitry Smirnov <onlyjob@member.fsf.org> | 2013-08-04 05:49:48 +1000 |
| commit | f5563d8240be0b355c53588139b9d1674676c691 (patch) | |
| tree | e4d9c0a8c6a42762aa2e703c28f16aa9abeb6d2a /debian/patches/debian.patch | |
| parent | reference get-orig-source implementation (diff) | |
| download | d2x-rebirth-f5563d8240be0b355c53588139b9d1674676c691.tar.gz d2x-rebirth-f5563d8240be0b355c53588139b9d1674676c691.tar.bz2 d2x-rebirth-f5563d8240be0b355c53588139b9d1674676c691.zip | |
New upstream release [0.58.1] + changelog summarydebian/0.58.1-1
Diffstat (limited to 'debian/patches/debian.patch')
| -rw-r--r-- | debian/patches/debian.patch | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/debian/patches/debian.patch b/debian/patches/debian.patch index 5b550ea..8438722 100644 --- a/debian/patches/debian.patch +++ b/debian/patches/debian.patch @@ -1,34 +1,34 @@ -Last-Update: 2012-12-31 -Author: Dmitry Smirnov <onlyjob@member.fsf.org> +Last-Update: 2013-08-04 Forwarded: not-needed +Author: Dmitry Smirnov <onlyjob@member.fsf.org> Description: set prefix and path to game data file --- a/SConstruct +++ b/SConstruct -@@ -14,10 +14,10 @@ - D2XMICRO = 3 - VERSION_STRING = ' v' + str(D2XMAJOR) + '.' + str(D2XMINOR) + '.' + str(D2XMICRO) - - # installation path --PREFIX = str(ARGUMENTS.get('prefix', '/usr/local')) --BIN_SUBDIR = '/bin' -+PREFIX = str(ARGUMENTS.get('prefix', '/usr')) -+BIN_SUBDIR = '/games' - DATA_SUBDIR = '/share/games/d2x-rebirth' - BIN_DIR = PREFIX + BIN_SUBDIR - DATA_DIR = PREFIX + DATA_SUBDIR - -@@ -451,9 +451,9 @@ +@@ -261,10 +261,10 @@ + class UserSettings(DXXCommon.UserSettings): + def __init__(self,ARGUMENTS,target): + DXXCommon.UserSettings.__init__(self, ARGUMENTS.ARGUMENTS) + # installation path +- PREFIX = str(ARGUMENTS.get('prefix', '/usr/local')) +- self.BIN_DIR = PREFIX + '/bin' ++ PREFIX = str(ARGUMENTS.get('prefix', '/usr')) ++ self.BIN_DIR = PREFIX + '/games' + self.DATA_DIR = PREFIX + '/share/games/' + target + # command-line parms + self.sharepath = str(ARGUMENTS.get('sharepath', self.DATA_DIR)) + # Settings to apply to mingw32 builds +@@ -635,9 +635,9 @@ Type 'scons -c' to clean up. Extra options (add them to command line, like 'scons extraoption=value'): -- 'sharepath=[DIR]' (non-Mac OS *NIX only) use [DIR] for shared game data. [default: /usr/local/share/games/d2x-rebirth] -+ 'sharepath=[DIR]' (non-Mac OS *NIX only) use [DIR] for shared game data. [default: /usr/share/games/d2x-rebirth] +- 'sharepath=[DIR]' (non-Mac OS *NIX only) use [DIR] for shared game data. [default: /usr/local/share/games/d2x-rebirth] ++ 'sharepath=[DIR]' (non-Mac OS *NIX only) use [DIR] for shared game data. [default: /usr/share/games/d2x-rebirth] 'opengl=[0/1]' build with OpenGL support [default: 1] 'opengles=[0/1]' build with OpenGL ES support [default: 0] + 'opengles_lib=[NAME]' specify the name of the OpenGL ES library to link against 'sdlmixer=[0/1]' build with SDL_Mixer support for sound and music (includes external music support) [default: 1] - 'asm=[0/1]' build with ASSEMBLER code (only with opengl=0, requires NASM and x86) [default: 0] --- a/INSTALL.txt +++ b/INSTALL.txt @@ -101,9 +101,9 @@ |