[SCM] KTorrent Debian packaging. branch, master, updated. master/3.2.1+dfsg.1-1-10-ga7312b5

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 3916170e97aa6f2dabee9c605d86607cca62aebd
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jun 1 23:33:46 2009 +0300

    Export and add debian/patches.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>
---
 debian/changelog                                   |    3 +-
 .../general/qt_tracker_default_https_port_fix.diff |   35 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 97cc675..27b3b36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ ktorrent (3.2.2+dfsg.1-1) UNRELEASED; urgency=low
   * Bump debhelper build depend to 7.0.50.
   * Bump Standards-Version to 3.8.1 (no changes needed).
   * Update to newer version of build snippets (and add topgit support).
+  * Add a patch to fix default port for https in Qt based tracker announces.
 
- -- Modestas Vainius <modestas at vainius.eu>  Mon, 01 Jun 2009 23:30:14 +0300
+ -- Modestas Vainius <modestas at vainius.eu>  Mon, 01 Jun 2009 23:31:41 +0300
 
 ktorrent (3.2.1+dfsg.1-1) unstable; urgency=low
 
diff --git a/debian/patches/general/qt_tracker_default_https_port_fix.diff b/debian/patches/general/qt_tracker_default_https_port_fix.diff
new file mode 100644
index 0000000..4cc5272
--- /dev/null
+++ b/debian/patches/general/qt_tracker_default_https_port_fix.diff
@@ -0,0 +1,35 @@
+From: Modestas Vainius <modestas at vainius.eu>
+Subject: [PATCH] Proper default port for https protocol
+
+When using QHttp to do tracker announces
+("Do not use KIO for tracker announces" option), default to the right port
+for https protocol (not to 80).
+
+Signed-off-by: Modestas Vainius <modestas at vainius.eu>
+
+---
+ libbtcore/tracker/httpannouncejob.cpp |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libbtcore/tracker/httpannouncejob.cpp b/libbtcore/tracker/httpannouncejob.cpp
+index 9123467..59b2e70 100644
+--- a/libbtcore/tracker/httpannouncejob.cpp
++++ b/libbtcore/tracker/httpannouncejob.cpp
+@@ -35,7 +35,7 @@ namespace bt
+ 
+ 	void HTTPAnnounceJob::start()
+ 	{
+-		http->setHost(url.host(),url.protocol() == "https" ? QHttp::ConnectionModeHttps : QHttp::ConnectionModeHttp,url.port(80));
++		http->setHost(url.host(),url.protocol() == "https" ? QHttp::ConnectionModeHttps : QHttp::ConnectionModeHttp,url.port() > 0 ? url.port() : 0);
+ 		if (!proxy_host.isEmpty() && proxy_port > 0)
+ 			http->setProxy(proxy_host,proxy_port);
+ 		
+@@ -90,4 +90,4 @@ namespace bt
+ 
+ 
+ 
+-}
+\ No newline at end of file
++}
+-- 
+tg: (9cb9cec..) general/qt_tracker_default_https_port_fix (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a5ca21f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+general/qt_tracker_default_https_port_fix.diff -p1

-- 
KTorrent Debian packaging.