[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 5afdc1239cfd927d645f7183b59b5d5032be1e57
Author: Andrey Rahmatullin <wrar at wrar.name>
Date:   Thu Apr 19 13:02:08 2012 +0600

    Update fix-log-path.patch.

diff --git a/debian/patches/fix-log-path.patch b/debian/patches/fix-log-path.patch
index aeca1a7..6024b93 100644
--- a/debian/patches/fix-log-path.patch
+++ b/debian/patches/fix-log-path.patch
@@ -2,13 +2,11 @@ Description: Fix log file path
  Write the log file to XDG_DATA_HOME instead of ./log/.
 Author: Andrey Rahmatullin <wrar at wrar.name>
 Bug: http://code.google.com/p/dwarftherapist/issues/detail?id=344
-Last-Update: 2011-08-06
+Last-Update: 2012-04-19
 
-diff --git a/src/dwarftherapist.cpp b/src/dwarftherapist.cpp
-index f654c87..cf971f3 100644
 --- a/src/dwarftherapist.cpp
 +++ b/src/dwarftherapist.cpp
-@@ -21,6 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+@@ -21,6 +21,7 @@
  THE SOFTWARE.
  */
  #include <QtGui>
@@ -16,7 +14,7 @@ index f654c87..cf971f3 100644
  
  #include "dwarftherapist.h"
  #include "mainwindow.h"
-@@ -92,7 +93,15 @@ void DwarfTherapist::setup_logging() {
+@@ -92,7 +93,15 @@
  
      //setup logging
      m_log_mgr = new LogManager(this);
@@ -33,16 +31,15 @@ index f654c87..cf971f3 100644
      if (log) {
          LogAppender *app = m_log_mgr->add_appender("core", log, LL_TRACE);
          if (app) {
-diff --git a/src/main.cpp b/src/main.cpp
-index 424204d..92b89fb 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
-@@ -33,6 +33,8 @@ THE SOFTWARE.
- #include "dwarftherapist.h"
+@@ -39,6 +39,9 @@
+         return 0;
+     }
  
- int main(int argc, char *argv[]) {
 +    QCoreApplication::setOrganizationName(COMPANY);
 +    QCoreApplication::setApplicationName(PRODUCT);
++
      DwarfTherapist d(argc, argv);
      return d.exec();
  }

-- 
dwarftherapist packaging