[SCM] KTorrent Debian packaging. branch, master, updated. debian/4.1-rc1-1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 5a9d227326b9e67d0db9e73c947aeec64cd19268
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Feb 19 02:39:45 2011 +0200

    Restore compatibility with KDE Devel Platform 4.4.
    
    Backport saveReply() from b9e0299f^:plugins/search/searchwidget.cpp and use it
    in place of KWebPage::downloadResponse() when building against KDE Devel Platform 4.4.
    
    Patch: upstream_kde4.4_compat.diff
---
 debian/changelog                           |    2 +
 debian/patches/series                      |    1 +
 debian/patches/upstream_kde4.4_compat.diff |   47 ++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d54a601..d9fc522 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ktorrent (4.1~rc1-0r1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Require libktorrent 1.1~rc1.
+  * Add upstream_kde4.4_compat.diff patch in order to restore compatibility
+    with KDE Devel Platform 4.4.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 19 Feb 2011 01:32:51 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4af26d6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_kde4.4_compat.diff
diff --git a/debian/patches/upstream_kde4.4_compat.diff b/debian/patches/upstream_kde4.4_compat.diff
new file mode 100644
index 0000000..f20557f
--- /dev/null
+++ b/debian/patches/upstream_kde4.4_compat.diff
@@ -0,0 +1,47 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Restore compatibility with KDE Devel Platform 4.4.
+Last-Update: 2011-02-19
+Forwarded: yes
+
+Backport saveReply() from b9e0299f^:plugins/search/searchwidget.cpp and use it
+in place of KWebPage::downloadResponse() when building against KDE Devel Platform 4.4.
+--- a/plugins/search/webview.cpp
++++ b/plugins/search/webview.cpp
+@@ -38,6 +38,12 @@
+ #include "buffernetworkreply.h"
+ #include "localfilenetworkreply.h"
+ 
++// KDE Devel Platform 4.4 compatibility
++#include <kdeversion.h>
++#if (!KDE_IS_VERSION(4, 5, 0))
++#include <KMessageBox>
++#include <interfaces/functions.h>
++#endif
+ 
+ using namespace bt;
+ 
+@@ -186,8 +192,24 @@ namespace kt
+ 
+ 	void WebView::downloadResponse(QNetworkReply* reply)
+ 	{
++#if KDE_IS_VERSION(4, 5, 0)
+ 		KWebPage* p = (KWebPage*)page();
+ 		p->downloadResponse(reply);
++#else
++		QString fn = KFileDialog::getSaveFileName(KUrl("kfiledialog:///openTorrent"),kt::TorrentFileFilter(false),this);
++		if (!fn.isNull())
++		{
++			QFile fptr(fn);
++			if (!fptr.open(QIODevice::WriteOnly))
++			{
++				KMessageBox::error(this,i18n("Cannot open <b>%1</b>: %2",fn,fptr.errorString()));
++			}
++			else
++			{
++				fptr.write(reply->readAll());
++			}
++		}
++#endif
+ 	}
+ 
+ }

-- 
KTorrent Debian packaging.