[SCM] kopete packaging branch, master, updated. debian/4.13.1-1-61-gdb6961a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 31 15:03:07 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kopete.git;a=commitdiff;h=fc23a10
The following commit has been merged in the master branch:
commit fc23a10256c00d65da3b12cffc95ddddd2fdeaab
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date: Wed Jun 19 15:27:14 2013 +0100
updates
---
debian/changelog | 1 +
debian/control | 2 +-
debian/kopete.install | 9 ++
debian/libkopete4.symbols | 6 +-
debian/patches/kubuntu_no_break_api.diff | 268 +++++++++++++++++++++++++++++++
debian/patches/series | 1 +
6 files changed, 285 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1acd9ac..ea2496a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,5 +2,6 @@ kopete (4:4.10.80-0ubuntu1) UNRELEASED; urgency=low
* New upstream release
* Initial package split from kdenetwork
+ * kubuntu_no_break_api.diff revert upstream API break
-- Jonathan Riddell <jriddell at ubuntu.com> Tue, 18 Jun 2013 14:56:38 +0100
diff --git a/debian/control b/debian/control
index 684040a..dd318eb 100644
--- a/debian/control
+++ b/debian/control
@@ -66,7 +66,7 @@ Architecture: any
Priority: extra
Depends: ${misc:Depends}, kde-runtime-dbg
Recommends: kde-workspace-dbg
-Suggests: kdenetwork (= ${source:Version})
+Suggests: kopete-dbg (= ${source:Version})
Breaks: kdenetwork-dbg
Replaces: kdenetwork-dbg
Description: debugging symbols for the KDE networking module
diff --git a/debian/kopete.install b/debian/kopete.install
index 2314ff3..7dc964b 100644
--- a/debian/kopete.install
+++ b/debian/kopete.install
@@ -711,3 +711,12 @@ usr/share/sounds/Kopete_Event.ogg
usr/share/sounds/Kopete_Received.ogg
usr/share/sounds/Kopete_Sent.ogg
usr/share/sounds/Kopete_User_is_Online.ogg
+usr/lib/kde4/kcm_kopete_history2.so
+usr/lib/kde4/kopete_history2.so
+usr/share/kde4/apps/kconf_update/kopete-update_icq_ssl.pl
+usr/share/kde4/apps/kconf_update/kopete-update_icq_ssl.upd
+usr/share/kde4/apps/kopete_history2/history2chatui.rc
+usr/share/kde4/apps/kopete_history2/history2ui.rc
+usr/share/kde4/config.kcfg/history2config.kcfg
+usr/share/kde4/services/kconfiguredialog/kopete_history2_config.desktop
+usr/share/kde4/services/kopete_history2.desktop
diff --git a/debian/libkopete4.symbols b/debian/libkopete4.symbols
index c9380e4..de8780c 100644
--- a/debian/libkopete4.symbols
+++ b/debian/libkopete4.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.10.4 i386
+# SymbolsHelper-Confirmed: 4:4.10.80 i386
libkopete.so.4 libkopete4 #MINVER#
_ZGVZN6Kopete2UI8ListView4Item7Private18theVisibilityTimerEvE5timer at Base 4:4.3.4
_ZGVZN6Kopete2UI8ListView4Item7Private21theLayoutAnimateTimerEvE5timer at Base 4:4.3.4
@@ -468,7 +468,9 @@ libkopete.so.4 libkopete4 #MINVER#
_ZN6Kopete14AccountManager4loadEv at Base 4:4.3.4
_ZN6Kopete14AccountManager4saveEv at Base 4:4.3.4
_ZN6Kopete14AccountManager4selfEv at Base 4:4.3.4
+ _ZN6Kopete14AccountManager6resumeEv at Base 4:4.10.80
_ZN6Kopete14AccountManager6s_selfE at Base 4:4.3.4
+ _ZN6Kopete14AccountManager7suspendEv at Base 4:4.10.80
_ZN6Kopete14AccountManagerC1Ev at Base 4:4.3.4
_ZN6Kopete14AccountManagerC2Ev at Base 4:4.3.4
_ZN6Kopete14AccountManagerD0Ev at Base 4:4.3.4
@@ -1330,6 +1332,8 @@ libkopete.so.4 libkopete4 #MINVER#
_ZN6Kopete7Account23slotOnlineStatusChangedEPNS_7ContactERKNS_12OnlineStatusES5_ at Base 4:4.3.4
_ZN6Kopete7Account26slotContactPropertyChangedEPNS_17PropertyContainerERK7QStringRK8QVariantS8_ at Base 4:4.3.4
_ZN6Kopete7Account5blockERK7QString at Base 4:4.3.4
+ _ZN6Kopete7Account6resumeEv at Base 4:4.10.80
+ _ZN6Kopete7Account7suspendERKNS_13StatusMessageE at Base 4:4.10.80
_ZN6Kopete7Account7unblockERK7QString at Base 4:4.3.4
_ZN6Kopete7Account8contactsEv at Base 4:4.3.4
_ZN6Kopete7Account8setColorERK6QColor at Base 4:4.3.4
diff --git a/debian/patches/kubuntu_no_break_api.diff b/debian/patches/kubuntu_no_break_api.diff
new file mode 100644
index 0000000..865001d
--- /dev/null
+++ b/debian/patches/kubuntu_no_break_api.diff
@@ -0,0 +1,268 @@
+Index: kopete-4.10.80/libkopete/kopetemimetypehandler.cpp
+===================================================================
+--- kopete-4.10.80.orig/libkopete/kopetemimetypehandler.cpp 2013-06-19 15:01:39.080931369 +0100
++++ kopete-4.10.80/libkopete/kopetemimetypehandler.cpp 2013-06-19 15:01:39.064931370 +0100
+@@ -128,7 +128,7 @@
+
+ if( mimeHandler )
+ {
+- mimeHandler->handleURL( QString(), url );
++ mimeHandler->handleURL( url );
+ return true;
+ }
+ else
+@@ -165,19 +165,30 @@
+ KUrl dest;
+ dest.setPath( file );
+
+- handler->handleURL( mimeType, dest );
++ if( !mimeType.isNull() )
++ handler->handleURL( mimeType, dest );
++ else
++ handler->handleURL( dest );
+
+ // for now, local-only handlers have to be synchronous
+ KIO::NetAccess::removeTempFile( file );
+ }
+ else
+ {
+- handler->handleURL( mimeType, url );
++ if( !mimeType.isNull() )
++ handler->handleURL( mimeType, url );
++ else
++ handler->handleURL( url );
+ }
+
+ return true;
+ }
+
++void MimeTypeHandler::handleURL( const KUrl &url ) const
++{
++ Q_UNUSED( url );
++}
++
+ void MimeTypeHandler::handleURL( const QString &mimeType, const KUrl &url ) const
+ {
+ Q_UNUSED( mimeType );
+@@ -195,6 +206,11 @@
+
+ void EmoticonMimeTypeHandler::handleURL( const QString &, const KUrl &url ) const
+ {
++ handleURL(url);
++}
++
++void EmoticonMimeTypeHandler::handleURL( const KUrl &url ) const
++{
+ Emoticons::self()->installTheme( url.toLocalFile() );
+ }
+
+Index: kopete-4.10.80/libkopete/kopetemimetypehandler.h
+===================================================================
+--- kopete-4.10.80.orig/libkopete/kopetemimetypehandler.h 2013-06-19 15:01:39.080931369 +0100
++++ kopete-4.10.80/libkopete/kopetemimetypehandler.h 2013-06-19 15:01:39.064931370 +0100
+@@ -67,6 +67,13 @@
+ bool canAcceptRemoteFiles() const;
+
+ /**
++ * Handles the URL @p url
++ *
++ * @param url The url to handle
++ */
++ virtual void handleURL( const KUrl &url ) const;
++
++ /**
+ * Handles the URL @p url, which has the mime type @p mimeType
+ *
+ * @param mimeType The mime type of the URL
+@@ -119,6 +126,7 @@
+ const QStringList mimeTypes() const;
+
+ void handleURL( const QString &mimeType, const KUrl &url ) const;
++ void handleURL( const KUrl &url ) const;
+ };
+
+ } // Kopete
+Index: kopete-4.10.80/protocols/irc/ircprotocol.cpp
+===================================================================
+--- kopete-4.10.80.orig/protocols/irc/ircprotocol.cpp 2013-06-19 15:01:39.080931369 +0100
++++ kopete-4.10.80/protocols/irc/ircprotocol.cpp 2013-06-19 15:01:39.068931369 +0100
+@@ -77,7 +77,7 @@
+ registerAsProtocolHandler(QString::fromLatin1("irc"));
+ }
+
+-void IRCProtocolHandler::handleURL(const QString &, const KUrl &url) const
++void IRCProtocolHandler::handleURL(const KUrl &url) const
+ {
+ kDebug(14120) << url;
+ if (!url.isValid())
+Index: kopete-4.10.80/protocols/irc/ircprotocol.h
+===================================================================
+--- kopete-4.10.80.orig/protocols/irc/ircprotocol.h 2013-06-19 15:01:39.080931369 +0100
++++ kopete-4.10.80/protocols/irc/ircprotocol.h 2013-06-19 15:01:39.068931369 +0100
+@@ -52,7 +52,7 @@
+
+ IRCProtocolHandler();
+
+- void handleURL( const QString &, const KUrl &url ) const;
++ void handleURL( const KUrl &url ) const;
+ };
+
+ static const QString CHAT_VIEW( QString::fromLatin1("kopete_chatwindow") );
+Index: kopete-4.10.80/protocols/jabber/jabberprotocol.cpp
+===================================================================
+--- kopete-4.10.80.orig/protocols/jabber/jabberprotocol.cpp 2013-06-19 15:01:39.080931369 +0100
++++ kopete-4.10.80/protocols/jabber/jabberprotocol.cpp 2013-06-19 15:01:39.068931369 +0100
+@@ -353,6 +353,11 @@
+
+ void JabberProtocol::handleURL(const QString&, const KUrl & kurl) const
+ {
++ handleURL(kurl);
++}
++
++void JabberProtocol::handleURL(const KUrl & kurl) const
++{
+ QUrl url=kurl; //QUrl has better query handling.
+ if(url.scheme() != "xmpp" && !url.scheme().isEmpty() )
+ return;
+Index: kopete-4.10.80/protocols/jabber/jabberprotocol.h
+===================================================================
+--- kopete-4.10.80.orig/protocols/jabber/jabberprotocol.h 2013-06-19 15:01:39.080931369 +0100
++++ kopete-4.10.80/protocols/jabber/jabberprotocol.h 2013-06-19 15:01:39.068931369 +0100
+@@ -148,6 +148,7 @@
+ /**
+ * inherited from Kopete::MimeTypeHandler
+ */
++ virtual void handleURL( const KUrl & url ) const;
+ virtual void handleURL(const QString&, const KUrl & kurl) const;
+
+ private:
+Index: kopete-4.10.80/protocols/oscar/aim/aimprotocol.cpp
+===================================================================
+--- kopete-4.10.80.orig/protocols/oscar/aim/aimprotocol.cpp 2013-06-19 15:01:39.080931369 +0100
++++ kopete-4.10.80/protocols/oscar/aim/aimprotocol.cpp 2013-06-19 15:01:39.068931369 +0100
+@@ -43,7 +43,7 @@
+ registerAsProtocolHandler(QString::fromLatin1("aim"));
+ }
+
+-void AIMProtocolHandler::handleURL(const QString&, const KUrl &url) const
++void AIMProtocolHandler::handleURL(const KUrl &url) const
+ {
+ /**
+ * Send a Message =================================================
+Index: kopete-4.10.80/protocols/oscar/aim/aimprotocol.h
+===================================================================
+--- kopete-4.10.80.orig/protocols/oscar/aim/aimprotocol.h 2013-06-19 15:01:39.080931369 +0100
++++ kopete-4.10.80/protocols/oscar/aim/aimprotocol.h 2013-06-19 15:01:39.072931369 +0100
+@@ -29,7 +29,7 @@
+ {
+ public:
+ AIMProtocolHandler();
+- void handleURL( const QString&, const KUrl & url ) const;
++ void handleURL( const KUrl & url ) const;
+ };
+
+ class AIMProtocol : public OscarProtocol
+Index: kopete-4.10.80/protocols/skype/skypeprotocol.cpp
+===================================================================
+--- kopete-4.10.80.orig/protocols/skype/skypeprotocol.cpp 2013-06-19 15:01:39.080931369 +0100
++++ kopete-4.10.80/protocols/skype/skypeprotocol.cpp 2013-06-19 15:01:39.072931369 +0100
+@@ -46,7 +46,7 @@
+ registerAsProtocolHandler("tell");
+ }
+
+-void SkypeProtocolHandler::handleURL(const QString &, const KUrl &url) const {
++void SkypeProtocolHandler::handleURL(const KUrl &url) const {
+ kDebug(SKYPE_DEBUG_GLOBAL);
+ if ( ! SkypeProtocol::protocol()->hasAccount() ) {
+ kDebug(SKYPE_DEBUG_GLOBAL) << "No Skype account registred";
+@@ -55,6 +55,10 @@
+ SkypeProtocol::protocol()->account()->SkypeActionHandler(url.url());
+ }
+
++void SkypeProtocolHandler::handleURL(const QString &, const KUrl &url) const {
++ handleURL(url);
++}
++
+ class SkypeProtocolPrivate {
+ private:
+ public:
+Index: kopete-4.10.80/protocols/skype/skypeprotocol.h
+===================================================================
+--- kopete-4.10.80.orig/protocols/skype/skypeprotocol.h 2013-06-19 15:01:39.080931369 +0100
++++ kopete-4.10.80/protocols/skype/skypeprotocol.h 2013-06-19 15:01:39.072931369 +0100
+@@ -36,6 +36,7 @@
+ {
+ public:
+ SkypeProtocolHandler();
++ void handleURL(const KUrl &url) const;
+ void handleURL(const QString &, const KUrl &url) const;
+ };
+
+Index: kopete-4.10.80/libkopete/kopetecontact.cpp
+===================================================================
+--- kopete-4.10.80.orig/libkopete/kopetecontact.cpp 2013-06-19 15:01:39.080931369 +0100
++++ kopete-4.10.80/libkopete/kopetecontact.cpp 2013-06-19 15:01:39.072931369 +0100
+@@ -274,7 +274,7 @@
+ // through the use of the customContextMenuActions() function
+
+ // Get the custom actions from the protocols ( pure virtual function )
+- QList<KAction*> *customActions = customContextMenuActions();
++ QList<KAction*> *customActions = customContextMenuActions( manager );
+ if( customActions && !customActions->isEmpty() )
+ {
+ menu->addSeparator();
+@@ -518,6 +518,11 @@
+ return 0L;
+ }
+
++QList<KAction*> *Contact::customContextMenuActions( ChatSession * /* manager */ )
++{
++ return customContextMenuActions();
++}
++
+ bool Contact::isOnline() const
+ {
+ return onlineStatus().isDefinitelyOnline();
+Index: kopete-4.10.80/libkopete/kopetecontact.h
+===================================================================
+--- kopete-4.10.80.orig/libkopete/kopetecontact.h 2013-06-19 15:01:39.080931369 +0100
++++ kopete-4.10.80/libkopete/kopetecontact.h 2013-06-19 15:01:39.072931369 +0100
+@@ -232,6 +232,11 @@
+ virtual QList<KAction *> *customContextMenuActions();
+
+ /**
++ * @todo What is this function for ?
++ */
++ virtual QList<KAction *> *customContextMenuActions( ChatSession *manager );
++
++ /**
+ * @brief Get the Context Menu for this contact
+ *
+ * This menu includes generic actions common to each protocol, and action defined in
+Index: kopete-4.10.80/protocols/skype/skypecontact.cpp
+===================================================================
+--- kopete-4.10.80.orig/protocols/skype/skypecontact.cpp 2013-06-19 15:01:39.080931369 +0100
++++ kopete-4.10.80/protocols/skype/skypecontact.cpp 2013-06-19 15:01:39.072931369 +0100
+@@ -361,6 +361,10 @@
+ return actions;
+ }
+
++QList<KAction*> *SkypeContact::customContextMenuActions(Kopete::ChatSession *) {
++ return customContextMenuActions();
++}
++
+ void SkypeContact::enableActions(bool value) {
+ d->callContactAction->setEnabled(value);
+ d->authorizeAction->setEnabled(value);
+Index: kopete-4.10.80/protocols/skype/skypecontact.h
+===================================================================
+--- kopete-4.10.80.orig/protocols/skype/skypecontact.h 2013-06-19 15:01:39.080931369 +0100
++++ kopete-4.10.80/protocols/skype/skypecontact.h 2013-06-19 15:01:39.072931369 +0100
+@@ -83,6 +83,7 @@
+ bool hasChat() const;
+ ///Tell kopete which actions to show in the contact pop-up menu
+ virtual QList<KAction*> *customContextMenuActions();
++ virtual QList<KAction*> *customContextMenuActions(Kopete::ChatSession *);
+ ///Give me actually existing chat session
+ SkypeChatSession *getChatSession();
+ ///Can this contact be called now?
diff --git a/debian/patches/series b/debian/patches/series
index 716c29a..9393f40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
kubuntu_03_no_mediastreamer_in_wlm.diff
+kubuntu_no_break_api.diff
--
kopete packaging
More information about the pkg-kde-commits
mailing list