[SCM] ktp-common-internals packaging branch, master, updated. debian/0.8.1-4-157-g3ee7b4d
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jan 21 19:28:28 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=2df1364
The following commit has been merged in the master branch:
commit 2df13647d7034b074aa98a60f48bbc7ddde77504
Merge: d2ba30b6e308041a0b288115c3875d4cc3e70ff9 189ec84cc3bd3e9b4c2514e2c2a607a782da4ff6
Author: Diane Trout <diane at ghic.org>
Date: Sun Aug 9 14:14:54 2015 -0700
Merge tag 'upstream/15.07.90'
Upstream version 15.07.90
CMakeLists.txt | 38 +-
KTp/CMakeLists.txt | 9 +-
KTp/Declarative/conversations-model.cpp | 7 +-
KTp/Declarative/messages-model.cpp | 20 +-
KTp/Declarative/pinned-contacts-model.cpp | 27 +-
KTp/Declarative/pinned-contacts-model.h | 5 -
KTp/Logger/CMakeLists.txt | 4 +-
KTp/Models/CMakeLists.txt | 4 +-
KTp/OTR/CMakeLists.txt | 4 +-
KTp/OTR/debug.h | 2 +-
KTp/Widgets/CMakeLists.txt | 4 +-
KTp/Widgets/join-chat-room-dialog.cpp | 2 +-
KTp/contact.cpp | 13 +-
KTp/contact.h | 6 +
KTp/global-presence.cpp | 3 +
KTp/global-presence.h | 2 +
KTp/message.cpp | 5 +-
cmake/modules/Findtelepathy-accounts-signon.cmake | 18 +
...elepathy-kde.png => 128-apps-telepathy-kde.png} | Bin
...m-groupwise.png => 16-actions-im-groupwise.png} | Bin
...16-actions-im-irc.png => 16-actions-im-irc.png} | Bin
...local-xmpp.png => 16-actions-im-local-xmpp.png} | Bin
...telepathy-kde.png => 16-apps-telepathy-kde.png} | Bin
...22-actions-im-aim.png => 22-actions-im-aim.png} | Bin
...-im-facebook.png => 22-actions-im-facebook.png} | Bin
...-im-gadugadu.png => 22-actions-im-gadugadu.png} | Bin
...ogle-talk.png => 22-actions-im-google-talk.png} | Bin
...m-groupwise.png => 22-actions-im-groupwise.png} | Bin
...22-actions-im-icq.png => 22-actions-im-icq.png} | Bin
...ions-im-jabber.png => 22-actions-im-jabber.png} | Bin
...local-xmpp.png => 22-actions-im-local-xmpp.png} | Bin
...22-actions-im-msn.png => 22-actions-im-msn.png} | Bin
...hi22-actions-im-qq.png => 22-actions-im-qq.png} | Bin
...ctions-im-skype.png => 22-actions-im-skype.png} | Bin
...ctions-im-yahoo.png => 22-actions-im-yahoo.png} | Bin
...how-offline.png => 22-actions-show-offline.png} | Bin
...ions-sort-name.png => 22-actions-sort-name.png} | Bin
...t-presence.png => 22-actions-sort-presence.png} | Bin
...telepathy-kde.png => 22-apps-telepathy-kde.png} | Bin
...32-actions-im-aim.png => 32-actions-im-aim.png} | Bin
...-im-facebook.png => 32-actions-im-facebook.png} | Bin
...-im-gadugadu.png => 32-actions-im-gadugadu.png} | Bin
...ogle-talk.png => 32-actions-im-google-talk.png} | Bin
...m-groupwise.png => 32-actions-im-groupwise.png} | Bin
...32-actions-im-icq.png => 32-actions-im-icq.png} | Bin
...32-actions-im-irc.png => 32-actions-im-irc.png} | Bin
...ions-im-jabber.png => 32-actions-im-jabber.png} | Bin
...local-xmpp.png => 32-actions-im-local-xmpp.png} | Bin
...32-actions-im-msn.png => 32-actions-im-msn.png} | Bin
...hi32-actions-im-qq.png => 32-actions-im-qq.png} | Bin
...ctions-im-skype.png => 32-actions-im-skype.png} | Bin
...ctions-im-yahoo.png => 32-actions-im-yahoo.png} | Bin
...telepathy-kde.png => 32-apps-telepathy-kde.png} | Bin
...48-actions-im-aim.png => 48-actions-im-aim.png} | Bin
...-im-facebook.png => 48-actions-im-facebook.png} | Bin
...-im-gadugadu.png => 48-actions-im-gadugadu.png} | Bin
...ogle-talk.png => 48-actions-im-google-talk.png} | Bin
...m-groupwise.png => 48-actions-im-groupwise.png} | Bin
...48-actions-im-icq.png => 48-actions-im-icq.png} | Bin
...ions-im-jabber.png => 48-actions-im-jabber.png} | Bin
...local-xmpp.png => 48-actions-im-local-xmpp.png} | Bin
...48-actions-im-msn.png => 48-actions-im-msn.png} | Bin
...hi48-actions-im-qq.png => 48-actions-im-qq.png} | Bin
...ctions-im-skype.png => 48-actions-im-skype.png} | Bin
...ctions-im-yahoo.png => 48-actions-im-yahoo.png} | Bin
...telepathy-kde.png => 48-apps-telepathy-kde.png} | Bin
...telepathy-kde.png => 64-apps-telepathy-kde.png} | Bin
data/icons/CMakeLists.txt | 102 ++---
...lepathy-kde.svgz => sc-apps-telepathy-kde.svgz} | Bin
data/ktelepathy.notifyrc | 53 ++-
kaccounts/CMakeLists.txt | 2 +
kaccounts/kaccounts-ktp-plugin.cpp | 464 +++++++++++----------
kaccounts/kaccounts-ktp-plugin.h | 2 +-
kpeople/actionsplugin/CMakeLists.txt | 14 +-
kpeople/actionsplugin/kpeople-actions-plugin.cpp | 86 +++-
kpeople/actionsplugin/kpeople-actions-plugin.h | 3 +
kpeople/actionsplugin/ktp_kpeople_plugin.desktop | 11 -
kpeople/actionsplugin/ktp_kpeople_plugin.json | 18 +
kpeople/datasourceplugin/CMakeLists.txt | 12 +-
.../datasourceplugin/im-persons-data-source.cpp | 20 +-
.../im_persons_data_source_plugin.desktop | 11 -
.../im_persons_data_source_plugin.json | 18 +
kpeople/uiplugins/CMakeLists.txt | 7 +-
kpeople/uiplugins/chatplugin/CMakeLists.txt | 5 +-
.../uiplugins/chatplugin/kpeople_chat_plugin.cpp | 2 +-
.../chatplugin/kpeople_chat_plugin.desktop | 11 -
.../uiplugins/chatplugin/kpeople_chat_plugin.json | 18 +
kpeople/uiplugins/imdetailswidget.cpp | 2 +-
kpeople/uiplugins/imdetailswidgetplugin.desktop | 11 -
kpeople/uiplugins/imdetailswidgetplugin.json | 17 +
otr-proxy/KTpProxy/CMakeLists.txt | 2 +-
otr-proxy/data/CMakeLists.txt | 2 +-
tools/debugger/CMakeLists.txt | 2 +-
tools/debugger/debug-message-view.cpp | 2 +-
94 files changed, 572 insertions(+), 498 deletions(-)
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list