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

Modestas Vainius modax at alioth.debian.org
Wed Mar 23 00:36:25 UTC 2011


The following commit has been merged in the master branch:
commit f0b179c982b12c7a37296b54e1344814b6d4497a
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Mar 23 02:09:58 2011 +0200

    Drop upstream_kde4.4_compat.diff patch, merged upstream.
---
 debian/changelog                           |    1 +
 debian/patches/series                      |    1 -
 debian/patches/upstream_kde4.4_compat.diff |   47 ----------------------------
 3 files changed, 1 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4b2af0..23f663e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ktorrent (4.1.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Require libktorrent-dev 1.1.0.
+  * Drop upstream_kde4.4_compat.diff patch, merged upstream.
 
  -- Modestas Vainius <modax at debian.org>  Wed, 23 Mar 2011 01:58:51 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4af26d6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_kde4.4_compat.diff
diff --git a/debian/patches/upstream_kde4.4_compat.diff b/debian/patches/upstream_kde4.4_compat.diff
deleted file mode 100644
index f20557f..0000000
--- a/debian/patches/upstream_kde4.4_compat.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-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.



More information about the pkg-kde-commits mailing list