[SCM] knights packaging branch, master, updated. upstream/2.2.0-14-g11e1936

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 72fe32127433d3aa6b6544d850b212b5068e148d
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Feb 17 13:12:10 2011 +0100

    Add 02_no_hotnewstuff.diff.
---
 debian/changelog                      |    1 +
 debian/patches/02_no_hotnewstuff.diff |   17 +++++++++++++++++
 debian/patches/series                 |    1 +
 3 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1680ec5..54bf6ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ knights (2.2.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Remove 01_add_categories_to_desktop_file.diff, no longer needed.
+  * Add 02_no_hotnewstuff.diff.
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Thu, 17 Feb 2011 12:29:35 +0100
 
diff --git a/debian/patches/02_no_hotnewstuff.diff b/debian/patches/02_no_hotnewstuff.diff
new file mode 100644
index 0000000..682cc90
--- /dev/null
+++ b/debian/patches/02_no_hotnewstuff.diff
@@ -0,0 +1,17 @@
+Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+Description: This patch disables Get Hot New Stuff support because it would
+ work only with GHNS 3 which is not used by libkdegames 4.4.x.
+ This pacth should be removed after uploading kdegames 4.5.x or later to
+ unstable.
+Forwarded: no
+--- a/src/knights.cpp
++++ b/src/knights.cpp
+@@ -255,7 +255,7 @@
+ #endif
+         dialog->addPage ( generalSettingsDlg, i18n ( "General" ), QLatin1String ( "games-config-options" ) );
+         connect ( dialog, SIGNAL ( settingsChanged ( QString ) ), m_view, SLOT ( settingsChanged() ) );
+-        QWidget* themeDlg = new KGameThemeSelector ( dialog, Settings::self(), KGameThemeSelector::NewStuffEnableDownload );
++        QWidget* themeDlg = new KGameThemeSelector ( dialog, Settings::self(), KGameThemeSelector::NewStuffDisableDownload );
+         dialog->addPage ( themeDlg, i18n ( "Theme" ), QLatin1String ( "games-config-theme" ) );
+         dialog->setAttribute ( Qt::WA_DeleteOnClose );
+         dialog->show();
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ffadca0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+02_no_hotnewstuff.diff

-- 
knights packaging