r717 - packages/vdrift/vdrift/trunk/debian/patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2006-05-18 23:00:29 +0000 (Thu, 18 May 2006)
New Revision: 717

Removed:
   packages/vdrift/vdrift/trunk/debian/patches/03_fix_build.patch
Modified:
   packages/vdrift/vdrift/trunk/debian/patches/01_libalut.patch
Log:
03_fix_build.patch merged with 01_libalut.patch


Modified: packages/vdrift/vdrift/trunk/debian/patches/01_libalut.patch
===================================================================
--- packages/vdrift/vdrift/trunk/debian/patches/01_libalut.patch	2006-05-18 20:44:02 UTC (rev 716)
+++ packages/vdrift/vdrift/trunk/debian/patches/01_libalut.patch	2006-05-18 23:00:29 UTC (rev 717)
@@ -1,6 +1,6 @@
-diff -ru vdrift-2006.02.21.orig/SConstruct vdrift-2006.02.21/SConstruct
---- vdrift-2006.02.21.orig/SConstruct	2006-02-20 07:24:53.000000000 +0100
-+++ vdrift-2006.02.21/SConstruct	2006-05-01 03:12:42.000000000 +0200
+diff -ru vdrift-0.0.2006.02.21/SConstruct vdrift-0.0.2006.02.21.new/SConstruct
+--- vdrift-0.0.2006.02.21/SConstruct	2006-02-20 07:24:53.000000000 +0100
++++ vdrift-0.0.2006.02.21.new/SConstruct	2006-05-19 00:34:00.000000000 +0200
 @@ -45,7 +45,7 @@
  			LIBPATH = ['.', '#lib'],
  		        options = opts)
@@ -10,15 +10,23 @@
  
  #--------------#
  # Save Options #
-diff -ru vdrift-2006.02.21.orig/src/SConscript vdrift-2006.02.21/src/SConscript
---- vdrift-2006.02.21.orig/src/SConscript	2006-02-20 07:01:20.000000000 +0100
-+++ vdrift-2006.02.21/src/SConscript	2006-05-01 03:11:48.000000000 +0200
-@@ -53,7 +53,7 @@
+diff -ru vdrift-0.0.2006.02.21/src/SConscript vdrift-0.0.2006.02.21.new/src/SConscript
+--- vdrift-0.0.2006.02.21/src/SConscript	2006-02-20 07:01:20.000000000 +0100
++++ vdrift-0.0.2006.02.21.new/src/SConscript	2006-05-19 00:34:35.000000000 +0200
+@@ -53,8 +53,8 @@
  local_env.ParseConfig('sdl-config --cflags --libs')
  local_env.Append(CPPDEFINES = [('DATA_DIR', '\\"$prefix\\"'),
                                 ('SETTINGS_DIR', '\\"$settings\\"')])
 -local_env.Append(LIBS = ['GL', 'GLU', 'SDL_image', 'SDL_net'])
+-local_env.Append(LIBPATH = ['/usr/X11R6/lib'])
 +local_env.Append(LIBS = ['GL', 'GLU', 'SDL_image', 'SDL_net','alut'])
- local_env.Append(LIBPATH = ['/usr/X11R6/lib'])
++local_env.Append(LIBPATH = ['/usr/lib'])
  
  #-----------------------#
+ # Distribute to src_dir #
+@@ -73,4 +73,4 @@
+ #---------#
+ # Install #
+ #---------#
+-local_env.Install('$destdir$bin', vdrift)
++local_env.Install('/usr/games/', vdrift)

Deleted: packages/vdrift/vdrift/trunk/debian/patches/03_fix_build.patch
===================================================================
--- packages/vdrift/vdrift/trunk/debian/patches/03_fix_build.patch	2006-05-18 20:44:02 UTC (rev 716)
+++ packages/vdrift/vdrift/trunk/debian/patches/03_fix_build.patch	2006-05-18 23:00:29 UTC (rev 717)
@@ -1,18 +0,0 @@
-diff -ru vdrift-0.0.2006.02.21.orig/src/SConscript vdrift-0.0.2006.02.21/src/SConscript
---- vdrift-0.0.2006.02.21.orig/src/SConscript	2006-05-18 22:17:01.000000000 +0200
-+++ vdrift-0.0.2006.02.21/src/SConscript	2006-05-18 22:16:35.000000000 +0200
-@@ -54,7 +54,7 @@
- local_env.Append(CPPDEFINES = [('DATA_DIR', '\\"$prefix\\"'),
-                                ('SETTINGS_DIR', '\\"$settings\\"')])
- local_env.Append(LIBS = ['GL', 'GLU', 'SDL_image', 'SDL_net','alut'])
--local_env.Append(LIBPATH = ['/usr/X11R6/lib'])
-+local_env.Append(LIBPATH = ['/usr/lib'])
- 
- #-----------------------#
- # Distribute to src_dir #
-@@ -73,4 +73,4 @@
- #---------#
- # Install #
- #---------#
--local_env.Install('$destdir$bin', vdrift)
-+local_env.Install('/usr/games', vdrift)