r2251 - in packages/trunk/opencity/debian: . patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2006-12-31 09:48:49 +0100 (Sun, 31 Dec 2006)
New Revision: 2251

Added:
   packages/trunk/opencity/debian/patches/
   packages/trunk/opencity/debian/patches/fix_homedir.diff
   packages/trunk/opencity/debian/patches/series
Modified:
   packages/trunk/opencity/debian/changelog
   packages/trunk/opencity/debian/control
   packages/trunk/opencity/debian/rules
Log:
+  * datafiles in /usr/share/games/opencity (Closes: #405042)
+   - add fix_homedir.diff to preinitialise this value
+   - use quilt to apply the patch


Modified: packages/trunk/opencity/debian/changelog
===================================================================
--- packages/trunk/opencity/debian/changelog	2006-12-30 23:46:46 UTC (rev 2250)
+++ packages/trunk/opencity/debian/changelog	2006-12-31 08:48:49 UTC (rev 2251)
@@ -1,8 +1,10 @@
 opencity (0.0.4stable-2) UNRELEASED; urgency=low
 
-  * empty 
+  * datafiles in /usr/share/games/opencity (Closes: #405042)
+   - add fix_homedir.diff to preinitialise this value 
+   - use quilt to apply the patch
 
- -- Gonéri Le Bouder <goneri at rulezlan.org>  Thu, 30 Nov 2006 19:24:05 +0100
+ -- Gonéri Le Bouder <goneri at rulezlan.org>  Sun, 31 Dec 2006 09:52:22 +0100
 
 opencity (0.0.4stable-1) unstable; urgency=low
 

Modified: packages/trunk/opencity/debian/control
===================================================================
--- packages/trunk/opencity/debian/control	2006-12-30 23:46:46 UTC (rev 2250)
+++ packages/trunk/opencity/debian/control	2006-12-31 08:48:49 UTC (rev 2251)
@@ -3,7 +3,9 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev (>= 1.2.5-7), docbook-to-man, libglu1-mesa-dev
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, libsdl1.2-dev,
+ libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev (>= 1.2.5-7),
+ docbook-to-man, libglu1-mesa-dev, quilt
 Standards-Version: 3.7.2
 
 Package: opencity

Added: packages/trunk/opencity/debian/patches/fix_homedir.diff
===================================================================
--- packages/trunk/opencity/debian/patches/fix_homedir.diff	2006-12-30 23:46:46 UTC (rev 2250)
+++ packages/trunk/opencity/debian/patches/fix_homedir.diff	2006-12-31 08:48:49 UTC (rev 2251)
@@ -0,0 +1,13 @@
+Index: opencity-0.0.4stable/src/main.cpp
+===================================================================
+--- opencity-0.0.4stable.orig/src/main.cpp	2006-12-31 09:42:55.000000000 +0100
++++ opencity-0.0.4stable/src/main.cpp	2006-12-31 09:49:13.000000000 +0100
+@@ -127,7 +127,7 @@
+ 	static int flags = 0;
+ 
+ /// Static so that the others can not access this
+-	static string gsHomeDir		= "";
++	static string gsHomeDir		= "/usr/share/games/opencity/";
+ 	static string gsSaveDir		= "";
+ 
+ 

Added: packages/trunk/opencity/debian/patches/series
===================================================================
--- packages/trunk/opencity/debian/patches/series	2006-12-30 23:46:46 UTC (rev 2250)
+++ packages/trunk/opencity/debian/patches/series	2006-12-31 08:48:49 UTC (rev 2251)
@@ -0,0 +1 @@
+fix_homedir.diff

Modified: packages/trunk/opencity/debian/rules
===================================================================
--- packages/trunk/opencity/debian/rules	2006-12-30 23:46:46 UTC (rev 2250)
+++ packages/trunk/opencity/debian/rules	2006-12-31 08:48:49 UTC (rev 2251)
@@ -18,9 +18,10 @@
 endif
 
 config.status: configure
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --datadir=/usr/share/games
 
 
 build: build-stamp
@@ -48,7 +49,8 @@
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 	dh_clean 
-	rm -f config.log config.status 
+	rm -f config.log config.status
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 
 install: build
 	dh_testdir