[SCM] knights packaging branch, master, updated. upstream/2.3.1-37-g90a1d2a

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 90a1d2a7042ae029ef0eda4a62641b196deacd51
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri May 27 14:27:09 2011 +0200

    Add load_right_default_theme.diff
---
 debian/changelog                             |    2 +
 debian/patches/load_right_default_theme.diff |   28 ++++++++++++++++++++++++++
 debian/patches/series                        |    1 +
 3 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0bd065..f4ad0ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 knights (2.3.2-0r0) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Add load_right_default_theme.diff to prevent issues when you have configured
+    a theme that doesn't exist (may happen easily with obsolete themes).
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Tue, 24 May 2011 23:18:09 +0200
 
diff --git a/debian/patches/load_right_default_theme.diff b/debian/patches/load_right_default_theme.diff
new file mode 100644
index 0000000..0ba13b6
--- /dev/null
+++ b/debian/patches/load_right_default_theme.diff
@@ -0,0 +1,28 @@
+From 0e786f459d274cf9a8afc87221bbb1c77ccd8eae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miha=20=C4=8Can=C4=8Dula?= <miha at noughmad.eu>
+Date: Thu, 26 May 2011 22:07:49 +0200
+Subject: [PATCH] Load the correct default theme when using KGR
+
+---
+ src/core/renderer.cpp |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/renderer.cpp b/src/core/renderer.cpp
+index 992b103..14e688b 100644
+--- a/src/core/renderer.cpp
++++ b/src/core/renderer.cpp
+@@ -25,9 +25,9 @@ using namespace Knights;
+ 
+ #if defined WITH_KGR 
+ 
+-Renderer::Renderer ( const QString& defaultTheme ) : KGameRenderer ( defaultTheme )
++Renderer::Renderer ( const QString& defaultTheme ) : KGameRenderer ( QLatin1String("themes/default.desktop") )
+ {
+-
++    setTheme ( defaultTheme );
+ }
+ Renderer::~Renderer () 
+ {
+-- 
+1.7.5.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8bab037
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+load_right_default_theme.diff

-- 
knights packaging