[SCM] KDE Network module packaging branch, kde4.6, updated. debian/4.6.5-2-8-g8e2c22a
Pino Toscano
pino at alioth.debian.org
Thu Oct 13 21:52:24 UTC 2011
The following commit has been merged in the kde4.6 branch:
commit b7fa61a196f305b94a3da26a5995e3e6754dd5ee
Author: Pino Toscano <pino at debian.org>
Date: Thu Oct 13 23:49:56 2011 +0200
patches: add/improve DEP3 headers
---
debian/patches/libgadu_pthread_check.diff | 1 +
debian/patches/protocols_namespaces.diff | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/patches/libgadu_pthread_check.diff b/debian/patches/libgadu_pthread_check.diff
index a2f2fac..8e34645 100644
--- a/debian/patches/libgadu_pthread_check.diff
+++ b/debian/patches/libgadu_pthread_check.diff
@@ -5,6 +5,7 @@ Description: Fix libgadu pthread check.
located in /usr/include, but LIBGADU_INCLUDE_DIR only contains
the additional required include paths, such as those added by gnutls,
as found with latest openSUSE libgadu.pc
+Applied-Upstream: 4.8
--- /dev/null
+++ b/kopete/cmake/modules/gadu_pthread_check.c
diff --git a/debian/patches/protocols_namespaces.diff b/debian/patches/protocols_namespaces.diff
index d228303..a423c32 100644
--- a/debian/patches/protocols_namespaces.diff
+++ b/debian/patches/protocols_namespaces.diff
@@ -2,8 +2,10 @@ Author: Sune Vuorela <sune at debian.org>
Author: Ralf Jung <ralfjung-e at gmx.de>
Description: Put protocols' Client classes in a namespace.
This patch avoids crashes when terminating kopete, fixes these bugs:
- https://bugs.kde.org/show_bug.cgi?id=268056
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644197
+Bug: https://bugs.kde.org/show_bug.cgi?id=268056
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644197
+Applied-Upstream: 4.8, commit:1257454 (for the kopete/protocols/oscar/* parts)
+
--- a/kopete/protocols/oscar/oscarprivacyengine.h
+++ b/kopete/protocols/oscar/oscarprivacyengine.h
@@ -33,7 +33,9 @@ class QComboBox;
--
KDE Network module packaging
More information about the pkg-kde-commits
mailing list