diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/LDFLAGS.patch | 18 | ||||
| -rw-r--r-- | debian/patches/debian.patch | 38 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/spelling.patch | 2 |
4 files changed, 20 insertions, 39 deletions
diff --git a/debian/patches/LDFLAGS.patch b/debian/patches/LDFLAGS.patch deleted file mode 100644 index 0de9c2a..0000000 --- a/debian/patches/LDFLAGS.patch +++ /dev/null @@ -1,18 +0,0 @@ -Last-Update: 2012-12-31 -Author: Dmitry Smirnov <onlyjob@member.fsf.org> -Forwarded: not-needed -Description: use LDFLAGS from system environment - ---- a/SConstruct -+++ b/SConstruct -@@ -295,9 +295,9 @@ - env['CXX'] = os.environ['CXX'] - if os.environ.has_key('CXXFLAGS'): - env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) - if os.environ.has_key('LDFLAGS'): -- env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) -+ env['__RPATH'] += SCons.Util.CLVar(os.environ['LDFLAGS']) - - # windows or *nix? - if sys.platform == 'win32': - print "compiling on Windows" 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 @@ diff --git a/debian/patches/series b/debian/patches/series index 34fbbe4..e09e40a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ debian.patch homepath.patch -LDFLAGS.patch spelling.patch diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch index 38afe63..d65ef86 100644 --- a/debian/patches/spelling.patch +++ b/debian/patches/spelling.patch @@ -5,7 +5,7 @@ Description: minor spelling corrections --- a/main/inferno.c +++ b/main/inferno.c -@@ -117,9 +117,9 @@ +@@ -106,9 +106,9 @@ void print_commandline_help() { printf( "\n System Options:\n\n"); |