[SCM] dwarftherapist packaging branch, master, updated. upstream/0.6.12+hg20120419-11-gf2f6a2d

[Andrey Rahmatullin]

The following commit has been merged in the master branch:
commit 1a284998693aebb02c5dc575f6cad46cda49fb53
Author: Andrey Rahmatullin <wrar at wrar.name>
Date:   Thu Apr 19 15:47:36 2012 +0600

    Fix the game_data.ini path too.

diff --git a/debian/patches/fix-etc-path.patch b/debian/patches/fix-etc-path.patch
index f665327..f90cc2f 100644
--- a/debian/patches/fix-etc-path.patch
+++ b/debian/patches/fix-etc-path.patch
@@ -1,14 +1,12 @@
 Description: Fix data files path
- Read the memory layout data from /etc/dwarftherapist instead of ./etc/.
+ Read the game data from /etc/dwarftherapist instead of ./etc/.
 Author: Andrey Rahmatullin <wrar at wrar.name>
 Bug: http://code.google.com/p/dwarftherapist/issues/detail?id=349
-Last-Update: 2011-08-06
+Last-Update: 2012-04-19
 
-diff --git a/src/dfinstance.cpp b/src/dfinstance.cpp
-index 76b107b..a11aecd 100644
 --- a/src/dfinstance.cpp
 +++ b/src/dfinstance.cpp
-@@ -79,7 +79,7 @@ DFInstance::DFInstance(QObject* parent)
+@@ -82,7 +82,7 @@
      search_paths << working_dir.path();
  
      QString subdir = LAYOUT_SUBDIR;
@@ -17,3 +15,14 @@ index 76b107b..a11aecd 100644
  
      TRACE << "Searching for MemoryLayout ini files in the following directories";
      foreach(QString path, search_paths) {
+--- a/src/gamedatareader.cpp
++++ b/src/gamedatareader.cpp
+@@ -35,7 +35,7 @@
+     : QObject(parent)
+ {
+     QDir working_dir = QDir::current();
+-    QString filename = working_dir.absoluteFilePath("etc/game_data.ini");
++    QString filename("/etc/dwarftherapist/game_data.ini");
+     m_data_settings = new QSettings(filename, QSettings::IniFormat);
+ 
+     QStringList labor_names;

-- 
dwarftherapist packaging