[opencity] 23/91: + * datafiles in /usr/share/games/opencity (Closes: #405042) + - add fix_homedir.diff to preinitialise this value + - use quilt to apply the patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository opencity.

commit 7434ade10b53d82c229349b4cd8e7c11263914cf
Author: Gonéri Le Bouder <goneri at rulezlan.org>
Date:   Sun Dec 31 08:48:49 2006 +0000

    +  * datafiles in /usr/share/games/opencity (Closes: #405042)
    +   - add fix_homedir.diff to preinitialise this value
    +   - use quilt to apply the patch
---
 debian/changelog                |  6 ++++--
 debian/control                  |  4 +++-
 debian/patches/fix_homedir.diff | 13 +++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  6 ++++--
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e610d2c..19284a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
diff --git a/debian/control b/debian/control
index 86da7c0..bbf20c3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,9 @@ Section: games
 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
diff --git a/debian/patches/fix_homedir.diff b/debian/patches/fix_homedir.diff
new file mode 100644
index 0000000..93a6f85
--- /dev/null
+++ b/debian/patches/fix_homedir.diff
@@ -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		= "";
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7152482
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_homedir.diff
diff --git a/debian/rules b/debian/rules
index e05c41c..613bf97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,9 +18,10 @@ else
 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 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/opencity.git