[SCM] knights packaging branch, master, updated. upstream/2.2.0-28-g73e8387

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit ddc840944bc85486a10e9a4a44b4d67dab28cd58
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Mon Apr 25 22:35:29 2011 +0200

    Remove 02_no_hotnewstuff.diff
---
 debian/changelog                      |    2 ++
 debian/control                        |    4 ++--
 debian/patches/02_no_hotnewstuff.diff |   17 -----------------
 debian/patches/series                 |    1 -
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf32dc6..9df71b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 knights (2.3.1-2~pre1) UNRELEASED; urgency=low
  
+  * Remove 02_no_hotnewstuff.diff since knights GHNS is suposed to work
+    fine with KDE 4.6 libraries.
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Mon, 25 Apr 2011 21:39:46 +0200
 
diff --git a/debian/control b/debian/control
index e8f91de..0bac91d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: games
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: José Manuel Santamaría Lema <panfaust at gmail.com>
-Build-Depends: debhelper (>= 7), cdbs, pkg-kde-tools, cmake, kdelibs5-dev (>> 4:4.4),
- libkdegames-dev (>> 4:4.4)
+Build-Depends: debhelper (>= 7), cdbs, pkg-kde-tools, cmake, kdelibs5-dev (>> 4:4.6),
+ libkdegames-dev (>> 4:4.6)
 Standards-Version: 3.9.1
 Homepage: http://kde-apps.org/content/show.php/Knights?content=122046
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/knights.git
diff --git a/debian/patches/02_no_hotnewstuff.diff b/debian/patches/02_no_hotnewstuff.diff
deleted file mode 100644
index 682cc90..0000000
--- a/debian/patches/02_no_hotnewstuff.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index ffadca0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-02_no_hotnewstuff.diff

-- 
knights packaging