r1731 - in packages/trunk/vdrift/debian: . patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2006-09-29 21:55:16 +0000 (Fri, 29 Sep 2006)
New Revision: 1731

Added:
   packages/trunk/vdrift/debian/patches/
   packages/trunk/vdrift/debian/patches/fix_datadir.diff
   packages/trunk/vdrift/debian/patches/series
Modified:
   packages/trunk/vdrift/debian/changelog
   packages/trunk/vdrift/debian/control
   packages/trunk/vdrift/debian/rules
Log:
* add patch fix_datadir.diff
     + builddeps on quilt


Modified: packages/trunk/vdrift/debian/changelog
===================================================================
--- packages/trunk/vdrift/debian/changelog	2006-09-29 03:08:26 UTC (rev 1730)
+++ packages/trunk/vdrift/debian/changelog	2006-09-29 21:55:16 UTC (rev 1731)
@@ -10,6 +10,8 @@
   * Architecture: amd64 arm i386 ia64 powerpc (Closes: #385840, #376740)
   * vdrift.desktop: better french translation
   * remove template header from rules file
+  * add patch fix_datadir.diff
+   + builddeps on quilt
 
   [ Eddy Petrişor ]
   * Added Romanian translation to desktop file

Modified: packages/trunk/vdrift/debian/control
===================================================================
--- packages/trunk/vdrift/debian/control	2006-09-29 03:08:26 UTC (rev 1730)
+++ packages/trunk/vdrift/debian/control	2006-09-29 21:55:16 UTC (rev 1731)
@@ -5,7 +5,7 @@
 Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>
 Build-Depends: debhelper (>= 5.0.0), libsdl-dev, libsdl-image1.2-dev,
  libsdl-net1.2-dev, libopenal-dev, libalut-dev, scons, g++-3.4, docbook-to-man,
- gettext
+ gettext, quilt
 Standards-Version: 3.7.2
 
 Package: vdrift

Added: packages/trunk/vdrift/debian/patches/fix_datadir.diff
===================================================================
--- packages/trunk/vdrift/debian/patches/fix_datadir.diff	                        (rev 0)
+++ packages/trunk/vdrift/debian/patches/fix_datadir.diff	2006-09-29 21:55:16 UTC (rev 1731)
@@ -0,0 +1,21 @@
+Index: vdrift-0.0.2006.07.08/src/settings.cpp
+===================================================================
+--- vdrift-0.0.2006.07.08.orig/src/settings.cpp	2006-09-29 23:41:46.000000000 +0200
++++ vdrift-0.0.2006.07.08/src/settings.cpp	2006-09-29 23:42:44.000000000 +0200
+@@ -84,12 +84,10 @@
+ 	{
+ 		cout << "BinReloc successfully initialized." << endl;
+ 		cout << "Executable path: " << br_find_exe( "/usr/share/games/vdrift/bin" ) << endl;
+-		cout << "Data dir: " << br_find_prefix( "/usr/share/games/vdrift" );
+-		cout << "/data" << endl;
+-		cout << "Localedir: " << br_find_locale_dir( "/usr/share/locale" ) << endl;
+-		data_directory = br_find_prefix( "/usr/share/games/vdrift" );
+-		locale_directory = br_find_locale_dir( "/usr/share/locale" );
+-		data_directory += "/data";
++		cout << "Data dir: " << "/usr/share/games/vdrift/data";
++		cout << "Localedir: " << "/usr/share/locale" << endl;
++		data_directory = "/usr/share/games/vdrift/data";
++		locale_directory = "/usr/share/locale";
+ 	}
+ #else
+ 	locale_directory = LOCALEDIR;

Added: packages/trunk/vdrift/debian/patches/series
===================================================================
--- packages/trunk/vdrift/debian/patches/series	                        (rev 0)
+++ packages/trunk/vdrift/debian/patches/series	2006-09-29 21:55:16 UTC (rev 1731)
@@ -0,0 +1 @@
+fix_datadir.diff

Modified: packages/trunk/vdrift/debian/rules
===================================================================
--- packages/trunk/vdrift/debian/rules	2006-09-29 03:08:26 UTC (rev 1730)
+++ packages/trunk/vdrift/debian/rules	2006-09-29 21:55:16 UTC (rev 1731)
@@ -14,6 +14,7 @@
 
 configure: configure-stamp
 configure-stamp:
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	dh_testdir
 
 
@@ -22,7 +23,7 @@
 build-stamp: configure-stamp 
 	dh_testdir
 	docbook-to-man debian/vdrift.sgml > debian/vdrift.6
-	scons use_gcc_34=1 destdir=debian/vdrift bindir=games release=1
+	scons use_gcc_34=1 destdir=debian/vdrift bindir=/usr/games release=1
 	scons  release=1
 	touch build-stamp
 
@@ -30,7 +31,8 @@
 	dh_testdir
 	dh_testroot
 	rm -Rf po/debian .sconsign.dblite .sconf_temp vdrift.conf build debian/vdrift
-	dh_clean 
+	dh_clean
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 
 install: build
 	dh_testdir