[SCM] KTorrent Debian packaging. branch, master, updated. master/3.2.2+dfsg.1-1-3-gfbffb8d

Modestas Vainius modax-guest at alioth.debian.org
Wed Jun 3 19:20:11 UTC 2009


The following commit has been merged in the master branch:
commit d3d05cdae9c4b39732512dd4e9a160f338c9ab4a
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Jun 3 21:52:36 2009 +0300

    Rebuild against new upstream tarball for 3.2.2.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>
---
 debian/changelog                                   |    7 ++++
 .../general/qt_tracker_default_https_port_fix.diff |   35 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c7897e..867ec5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ktorrent (3.2.2+dfsg.2-1) unstable; urgency=low
+
+  * New upstream tarball for 3.2.2 (3.2.2-1).
+  * Remove general/qt_tracker_default_https_port_fix.diff, fixed upstream.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Wed, 03 Jun 2009 21:47:18 +0300
+
 ktorrent (3.2.2+dfsg.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/general/qt_tracker_default_https_port_fix.diff b/debian/patches/general/qt_tracker_default_https_port_fix.diff
deleted file mode 100644
index 4cc5272..0000000
--- a/debian/patches/general/qt_tracker_default_https_port_fix.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-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
deleted file mode 100644
index a5ca21f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-general/qt_tracker_default_https_port_fix.diff -p1

-- 
KTorrent Debian packaging.



More information about the pkg-kde-commits mailing list