[SCM] Packaging for Liero branch, debian, updated. 7d7084ac811a94d3788af9f229bc6437632f0951

[Martin Erik Werner]

The following commit has been merged in the debian branch:
commit 7d7084ac811a94d3788af9f229bc6437632f0951
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Tue Nov 22 01:44:15 2011 +0100

    updated datapath patches to handle all .DAT files
    
     * dataath.patch: return writable path for any .DAT
     * datapath_integration.patch:
       - gfx.cpp: handle different .DAT files

diff --git a/debian/patches/datapath.patch b/debian/patches/datapath.patch
index 8b01b87..61f1990 100644
--- a/debian/patches/datapath.patch
+++ b/debian/patches/datapath.patch
@@ -8,7 +8,7 @@ Last-Update: 2011-11-15
 
 --- /dev/null
 +++ b/dataPath.cpp
-@@ -0,0 +1,100 @@
+@@ -0,0 +1,106 @@
 +// Compile via ~$ g++ -c dataPath.cpp
 +#include "dataPath.hpp"
 +#include <fstream>
@@ -55,7 +55,13 @@ Last-Update: 2011-11-15
 +	string filepath_readonly = readonly_path + '/' + filename;
 +	string filepath_writable = configdotdir + '/' + filename;
 +	if (file_access_map.count(filename) == 0) {
-+		throw runtime_error("Unknown file '" + filename + "'");
++		if (filename.substr(filename.find_last_of(".") + 1)
++								== "DAT") {
++			// file ends with .DAT
++			return filepath_writable;
++		} else {
++			throw runtime_error("Unknown file '" + filename + "'");
++		}
 +	}
 +	bool file_shouldbe_writable = file_access_map.find(filename)->second;
 +
diff --git a/debian/patches/datapath_integration.patch b/debian/patches/datapath_integration.patch
index d96433f..50aee12 100644
--- a/debian/patches/datapath_integration.patch
+++ b/debian/patches/datapath_integration.patch
@@ -68,14 +68,14 @@ Last-Update: 2011-11-15
  void Gfx::saveSettings()
  {
 -	settings->save(joinPath(lieroEXERoot, settingsFile + ".DAT"));
-+	settings->save(data_path->file("LIERO.DAT"));
++	settings->save(data_path->file(settingsFile + ".DAT"));
  }
  
  bool Gfx::loadSettings()
  {
  	settings.reset(new Settings);
 -	return settings->load(joinPath(lieroEXERoot, settingsFile + ".DAT"));
-+	return settings->load(data_path->file("LIERO.DAT"));
++	return settings->load(data_path->file(settingsFile + ".DAT"));
  }
  
  void Gfx::drawBasicMenu(/*int curSel*/)

-- 
Packaging for Liero