[SCM] KDE Network module packaging branch, master, updated. debian/4.6.5-2-20-g919596a
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Fri Oct 21 04:40:44 UTC 2011
The following commit has been merged in the master branch:
commit a55a8ab025a16f77b4927af224041cddcd21a8f2
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Thu Oct 20 22:37:57 2011 +0200
Refresh protocols_namespaces.diff
---
debian/changelog | 1 +
debian/patches/protocols_namespaces.diff | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 223eb02..2cffb0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ kdenetwork (4:4.7.2-0r0) UNRELEASED; urgency=low
* Add ${perl:Depends} to kopete Depends.
* Update installed files.
* Update symbols files.
+ * Refresh patches.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 20 Oct 2011 12:55:24 -0300
diff --git a/debian/patches/protocols_namespaces.diff b/debian/patches/protocols_namespaces.diff
index cbcb636..d87219f 100644
--- a/debian/patches/protocols_namespaces.diff
+++ b/debian/patches/protocols_namespaces.diff
@@ -244,14 +244,14 @@ Applied-Upstream: 4.8, commit:1257454 (for the kopete/protocols/oscar/* parts)
{
--- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
-@@ -29,6 +29,7 @@
+@@ -30,6 +30,7 @@
#include <krandom.h>
using namespace KNetwork;
+using namespace KYahoo;
- SendFileTask::SendFileTask(Task* parent) : Task(parent)
- {
+
+ /* Buffer size to send file data. Automatically resized. Won't grow up past BUFFER_SIZE_MAX. Code will try
--- a/kopete/protocols/yahoo/libkyahoo/client.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/client.cpp
@@ -60,6 +60,7 @@
--
KDE Network module packaging
More information about the pkg-kde-commits
mailing list