[SCM] KDE Network module packaging branch, master, updated. debian/4.7.2-1-2-g1cb59cd

Eshat Cakar eshat-guest at alioth.debian.org
Wed Dec 7 15:09:17 UTC 2011


The following commit has been merged in the master branch:
commit 1cb59cd7d494fe14d51e6e6c5d2f6bee61c227c5
Author: Eshat Cakar <info at eshat.de>
Date:   Wed Dec 7 15:59:32 2011 +0100

    update protocols_namespaces.diff, upload to kdetrunk
---
 debian/changelog                         |    1 +
 debian/patches/protocols_namespaces.diff |  438 ------------------------------
 2 files changed, 1 insertions(+), 438 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3255c3c..b1f4ff1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kdenetwork (4:4.7.4-0r0) UNRELEASED; urgency=low
   [ Eshat Cakar ]
   * Add myself to uploaders.
   * Bump kde-sc-dev-latest build dependency to 4:4.7.4.
+  * Remove parts from protocols_namespaces.diff, that were applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 07 Dec 2011 15:31:25 +0100
 
diff --git a/debian/patches/protocols_namespaces.diff b/debian/patches/protocols_namespaces.diff
index d87219f..c731e84 100644
--- a/debian/patches/protocols_namespaces.diff
+++ b/debian/patches/protocols_namespaces.diff
@@ -4,7 +4,6 @@ Description: Put protocols' Client classes in a namespace.
  This patch avoids crashes when terminating kopete, fixes these bugs:
 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.7.3, commit:1258908 (for the kopete/protocols/groupwise/* and kopete/protocols/yahoo/* parts)
 Applied-Upstream: 4.8, commit:1257454 (for the kopete/protocols/oscar/* parts)
 
 --- a/kopete/protocols/oscar/oscarprivacyengine.h
@@ -167,440 +166,3 @@ Applied-Upstream: 4.8, commit:1257454 (for the kopete/protocols/oscar/* parts)
  
  class OscarAccountPrivate : public Client::CodecProvider
  {
---- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
-+++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
-@@ -27,6 +27,8 @@
- #include <kio/jobclasses.h>
- #include <QDomDocument>
- 
-+using namespace KYahoo;
-+
- YahooChatTask::YahooChatTask(Task* parent) : Task(parent)
- {
- 	kDebug(YAHOO_RAW_DEBUG) ;
---- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
-+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
-@@ -31,6 +31,8 @@
- #include <k3bufferedsocket.h>
- 
- using namespace KNetwork;
-+using namespace KYahoo;
-+
- ModifyYABTask::ModifyYABTask(Task* parent) : Task(parent)
- {
- 	kDebug(YAHOO_RAW_DEBUG) ;
---- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
-+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
-@@ -25,7 +25,9 @@
- #include <kurl.h>
- 
- class KJob;
--class Client;
-+namespace KYahoo {
-+	class Client;
-+}
- namespace KIO {
- 	class Job;
- 	class TransferJob;
-@@ -49,7 +51,7 @@ class YahooBuddyIconLoader : public QObj
- {
- 	Q_OBJECT
- public:
--	YahooBuddyIconLoader( Client *c );
-+	YahooBuddyIconLoader( KYahoo::Client *c );
- 	~YahooBuddyIconLoader();
- 
- 	/**
-@@ -71,7 +73,7 @@ private slots:
- private:
- 	typedef QMap< KIO::TransferJob *, IconLoadJob > TransferJobMap;
- 	TransferJobMap m_jobs;
--	Client *m_client;
-+	KYahoo::Client *m_client;
- };
- 
- #endif
---- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp
-+++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp
-@@ -25,6 +25,8 @@
- #include <kdebug.h>
- #include <kcodecs.h>
- 
-+using namespace KYahoo;
-+
- FileTransferNotifierTask::FileTransferNotifierTask(Task* parent) : Task(parent)
- {
- 	kDebug(YAHOO_RAW_DEBUG) ;
---- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
-+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
-@@ -31,6 +31,8 @@
- #include "yahootypes.h"
- #include "client.h"
- 
-+using namespace KYahoo;
-+
- YahooBuddyIconLoader::YahooBuddyIconLoader( Client *c )
- : m_client( c )
- {
---- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
-+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
-@@ -30,6 +30,7 @@
- #include <krandom.h>
- 
- using namespace KNetwork;
-+using namespace KYahoo;
- 
- 
- /* 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 @@
- 
- using namespace KNetwork;
- 
-+namespace KYahoo {
- 
- class Client::ClientPrivate
- {
-@@ -1009,4 +1010,6 @@ void Client::deleteTasks()
- 	d->receiveFileTask = 0;
- }
- 
-+}
-+
- #include "client.moc"
---- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
-+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
-@@ -30,6 +30,7 @@
- #include <klocale.h>
- 
- using namespace KNetwork;
-+using namespace KYahoo;
- 
- WebcamTask::WebcamTask(Task* parent) : Task(parent)
- {
---- a/kopete/protocols/yahoo/libkyahoo/task.cpp
-+++ b/kopete/protocols/yahoo/libkyahoo/task.cpp
-@@ -25,6 +25,8 @@
- 
- #include "task.h"
- 
-+using namespace KYahoo;
-+
- class Task::TaskPrivate
- {
- public:
---- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
-+++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
-@@ -24,6 +24,8 @@
- #include <kdebug.h>
- #include <klocale.h>
- 
-+using namespace KYahoo;
-+
- StatusNotifierTask::StatusNotifierTask(Task* parent) : Task(parent)
- {
- 	kDebug(YAHOO_RAW_DEBUG) ;
---- a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp
-+++ b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp
-@@ -23,6 +23,8 @@
- #include <kdebug.h>
- #include <klocale.h>
- 
-+using namespace KYahoo;
-+
- SendMessageTask::SendMessageTask(Task* parent) : Task(parent)
- {
- 	kDebug(YAHOO_RAW_DEBUG) ;
---- a/kopete/protocols/yahoo/libkyahoo/client.h
-+++ b/kopete/protocols/yahoo/libkyahoo/client.h
-@@ -42,6 +42,8 @@ class Task;
- class KTemporaryFile;
- struct YABEntry;
- 
-+namespace KYahoo {
-+
- class LIBKYAHOO_EXPORT Client : public QObject
- {
- Q_OBJECT
-@@ -749,4 +751,6 @@ Q_OBJECT
- 		QTimer *m_aliveTimer;
- };
- 
-+}
-+
- #endif
---- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp
-+++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
-@@ -37,6 +37,8 @@ extern "C"
- #include "libyahoo.h"
- }
- 
-+using namespace KYahoo;
-+
- LoginTask::LoginTask(Task* parent) : Task(parent)
- {
- 	kDebug(YAHOO_RAW_DEBUG) ;
---- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
-+++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
-@@ -24,6 +24,7 @@
- #include <kdebug.h>
- #include <klocale.h>
- 
-+using namespace KYahoo;
- 
- PictureNotifierTask::PictureNotifierTask(Task* parent) : Task(parent)
- {
---- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
-+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
-@@ -27,6 +27,8 @@
- #include <kio/jobclasses.h>
- #include <klocale.h>
- 
-+using namespace KYahoo;
-+
- YABTask::YABTask(Task* parent) : Task(parent)
- {
- 	kDebug(YAHOO_RAW_DEBUG) ;
---- a/kopete/protocols/yahoo/libkyahoo/task.h
-+++ b/kopete/protocols/yahoo/libkyahoo/task.h
-@@ -24,7 +24,10 @@
- 
- class QString;
- 
--class Client;
-+namespace KYahoo {
-+	class Client;
-+}
-+
- class Transfer;
- 
- class Task : public QObject
-@@ -33,11 +36,11 @@ class Task : public QObject
- public:
- 	enum { ErrDisc };
- 	Task(Task *parent);
--	Task( Client *, bool isRoot );
-+	Task( KYahoo::Client *, bool isRoot );
- 	virtual ~Task();
- 
- 	Task *parent() const;
--	Client *client() const;
-+	KYahoo::Client *client() const;
- 	Transfer *transfer() const;
- 	
- 	QString id() const;
---- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
-+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
-@@ -30,6 +30,7 @@
- #include <klocale.h>
- 
- using namespace KNetwork;
-+using namespace KYahoo;
- 
- SendPictureTask::SendPictureTask(Task* parent) : Task(parent)
- {
---- a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp
-+++ b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp
-@@ -23,6 +23,8 @@
- #include "client.h"
- #include <kdebug.h>
- 
-+using namespace KYahoo;
-+
- MessageReceiverTask::MessageReceiverTask(Task* parent) : Task(parent)
- {
- 	kDebug(YAHOO_RAW_DEBUG) ;
---- a/kopete/protocols/yahoo/yahooaccount.h
-+++ b/kopete/protocols/yahoo/yahooaccount.h
-@@ -54,7 +54,9 @@ class ChatSession;
- class StatusMessage;
- class FileTransferInfo;
- }
--class Client;
-+namespace KYahoo {
-+	class Client;
-+}
- struct YABEntry;
- class KJob;
- namespace KIO{
-@@ -87,7 +89,7 @@ public:
- 	/**
- 	 * The session
- 	 */
--	Client *yahooSession();
-+	KYahoo::Client *yahooSession();
- 
- 	/**
- 	 * Returns true if contact @p id is on the server-side contact list
-@@ -296,7 +298,7 @@ private:
- 	KAction *m_editOwnYABEntry;	// Menu item editOwnYABEntry
- 	KAction *m_joinChatAction;	// Menu item joinChatAction
- 	
--	Client *m_session;		// The Connection object
-+	KYahoo::Client *m_session;		// The Connection object
- };
- 
- #endif // YAHOOACCOUNT_H
---- a/kopete/protocols/yahoo/yahooaccount.cpp
-+++ b/kopete/protocols/yahoo/yahooaccount.cpp
-@@ -71,6 +71,8 @@
- #include "yahoochatselectordialog.h"
- #include "yahoochatchatsession.h"
- 
-+using namespace KYahoo;
-+
- YahooAccount::YahooAccount(YahooProtocol *parent, const QString& accountId)
-  : Kopete::PasswordedAccount(parent, accountId, false)
- {
---- a/kopete/protocols/groupwise/gwaccount.h
-+++ b/kopete/protocols/groupwise/gwaccount.h
-@@ -50,7 +50,9 @@ namespace QCA {
- }
- class QCATLSHandler;
- class ClientStream;
--class Client;
-+namespace GroupWise {
-+	class Client;
-+}
- class GWContactList;
- 
- using namespace GroupWise;
---- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h
-+++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h
-@@ -24,7 +24,9 @@
- #include "gwchatrooms.h"
- #include "libgroupwise_export.h"
- 
--class Client;
-+namespace GroupWise {
-+	class Client;
-+}
- 
- /**
-  * Keeps a record of the server side chatrooms
-@@ -34,7 +36,7 @@ class LIBGROUPWISE_EXPORT ChatroomManage
- {
- 	Q_OBJECT
- 	public:
--		ChatroomManager( Client * client);
-+		ChatroomManager( GroupWise::Client * client);
- 		~ChatroomManager();
- 		GroupWise::ChatroomMap rooms();
- 		void requestProperties( const QString & displayName );
-@@ -59,7 +61,7 @@ class LIBGROUPWISE_EXPORT ChatroomManage
- 		 */
- 		void slotGotChatProperties();
- 	private:
--		Client * m_client;
-+		GroupWise::Client * m_client;
- 		GroupWise::ChatroomMap m_rooms;
- 		bool m_replace;
- };
---- a/kopete/protocols/groupwise/libgroupwise/client.cpp
-+++ b/kopete/protocols/groupwise/libgroupwise/client.cpp
-@@ -47,6 +47,8 @@
- #include "userdetailsmanager.h"
- #include "client.h"
- 
-+namespace GroupWise {
-+
- class Client::ClientPrivate
- {
- public:
-@@ -545,4 +547,6 @@ void Client::smt_messageSent()
- 	}
- }
- 
-+}
-+
- #include "client.moc"
---- a/kopete/protocols/groupwise/libgroupwise/client.h
-+++ b/kopete/protocols/groupwise/libgroupwise/client.h
-@@ -39,6 +39,8 @@ class Task;
- 
- using namespace GroupWise;
- 
-+namespace GroupWise {
-+
- class LIBGROUPWISE_EXPORT Client : public QObject
- {
- Q_OBJECT
-@@ -401,4 +403,6 @@ fd		 * @param password
- 		ClientPrivate* d;
- };
- 
-+}
-+
- #endif
---- a/kopete/protocols/groupwise/libgroupwise/task.h
-+++ b/kopete/protocols/groupwise/libgroupwise/task.h
-@@ -27,7 +27,9 @@
- #include "libgroupwise_export.h"
- #include "transfer.h"
- 
--class Client;
-+namespace GroupWise {
-+	class Client;
-+}
- class Request; 
- 
- class LIBGROUPWISE_EXPORT Task : public QObject
-@@ -36,11 +38,11 @@ class LIBGROUPWISE_EXPORT Task : public
- public:
- 	enum { ErrDisc };
- 	Task(Task *parent);
--	Task( Client *, bool isRoot );
-+	Task( GroupWise::Client *, bool isRoot );
- 	virtual ~Task();
- 
- 	Task *parent() const;
--	Client *client() const;
-+	GroupWise::Client *client() const;
- 	Transfer *transfer() const;
- 	
- 	QString id() const;
---- a/kopete/protocols/groupwise/libgroupwise/privacymanager.h
-+++ b/kopete/protocols/groupwise/libgroupwise/privacymanager.h
-@@ -23,7 +23,9 @@
- #include <QStringList>
- #include "libgroupwise_export.h"
- 
--class Client;
-+namespace GroupWise {
-+	class Client;
-+}
- 
- /**
- Keeps a record of the server side privacy allow and deny lists, default policy and whether the user is allowed to change privacy settings
-@@ -34,7 +36,7 @@ class LIBGROUPWISE_EXPORT PrivacyManager
- {
- Q_OBJECT
- public:
--	PrivacyManager( Client * client);
-+	PrivacyManager( GroupWise::Client * client);
- 	~PrivacyManager();
- 	// accessors
- 	bool isBlocked( const QString & dn );
-@@ -79,7 +81,7 @@ protected slots:
- 	void slotAllowRemoved();
- 	void slotDenyRemoved();	
- private:
--	Client * m_client;
-+	GroupWise::Client * m_client;
- 	bool m_locked;
- 	bool m_defaultDeny;
- 	QStringList m_allowList;
---- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h
-+++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h
-@@ -25,7 +25,9 @@
- #include "gwerror.h"
- #include "libgroupwise_export.h"
- 
--class Client;
-+namespace GroupWise {
-+	class Client;
-+}
- 
- /**
- Several client event handling processes require that a contact's details are available before exposing the event to the user.  This class is responsible for issuing details requests, tracking which users the client already has received details for, and signalling when details have been received.  The manager allows multiple interleaved get details requests to be replaced by a single request.

-- 
KDE Network module packaging



More information about the pkg-kde-commits mailing list