[redeclipse] 441/494: add upstream patch for starting server without data

[Martin Werner]

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

arand-guest pushed a commit to branch debdir
in repository redeclipse.

commit dbfda83623110a9d0ab45e10e23f81436ee7f009
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Mon Mar 25 22:00:06 2013 +0100

    add upstream patch for starting server without data
---
 changelog                                          |  5 +++--
 ...-t-check-for-keymap-when-using-standalone.patch | 23 ++++++++++++++++++++++
 patches/series                                     |  1 +
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 85c9e62..0a21400 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,8 @@
 redeclipse (1.4-2) experimental; urgency=low
 
-  * Add upstream server install patch
-    - This fixes broken server-only installs
+  * Fix broken server-only installs
+    - Add upstream server install patch
+    - Add upstream patch enabling the server to start without data
 
  -- Martin Erik Werner <martinerikwerner at gmail.com>  Mon, 25 Mar 2013 21:18:33 +0100
 
diff --git a/patches/don-t-check-for-keymap-when-using-standalone.patch b/patches/don-t-check-for-keymap-when-using-standalone.patch
new file mode 100644
index 0000000..a27ef43
--- /dev/null
+++ b/patches/don-t-check-for-keymap-when-using-standalone.patch
@@ -0,0 +1,23 @@
+Description: don't check for keymap when using standalone
+ This allows server to start without data content
+Author: Quinton Reeves <qreeves at gmail.com>
+Origin: upstream, http://redeclipse.net/svn/5504
+Last-Update: 2013-03-26
+
+--- a/src/engine/server.cpp
++++ b/src/engine/server.cpp
+@@ -1407,11 +1407,13 @@
+         chdir(dir);
+     }
+ #endif
++#ifndef STANDALONE
+     loopi(3) if(!fileexists(findfile("data/config/keymap.cfg", "r"), "r"))
+-    {
++    { // standalone solution to this is: pebkac
+         if(i != 2) chdir("..");
+         else fatal("could not find data directory");
+     }
++#endif
+     addpackagedir("data");
+     defformatstring(gamedata)("game/%s", server::gameid());
+     addpackagedir(gamedata);
diff --git a/patches/series b/patches/series
index 5351ae2..b400436 100644
--- a/patches/series
+++ b/patches/series
@@ -2,3 +2,4 @@ windowed-by-default.patch
 build-with-system-enet.patch
 desktop-file-don-t-quote-icon-app-name.patch
 system-install-symlink-to-version.cfg-in-server-inst.patch
+don-t-check-for-keymap-when-using-standalone.patch

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