[SCM] ktp-contact-applet packaging branch, master, updated. upstream/0.4.0-16-gf4a8777
Diane Trout
diane-guest at alioth.debian.org
Sat Jul 13 06:21:38 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-contact-applet.git;a=commitdiff;h=549e210
The following commit has been merged in the master branch:
commit 549e21098e0dbff056bee46ddcf52896ec5fa587
Merge: b932cf390a111ccde369b65d5fd886f6ee535f74 9c8be4a8af8c478e40cebe1833aaa51a59e52f2a
Author: Diane Trout <diane at ghic.org>
Date: Sun May 26 16:57:19 2013 -0700
Merge tag 'upstream/0.6.2'
Upstream version 0.6.2
50-renameKTpApplets.js | 85 ++++
CMakeLists.txt | 28 +-
COPYING.LIB | 502 ++++++++++++++++++++
chat/CMakeLists.txt | 9 +
chat/org.kde.ktp-chat/contents/config/main.xml | 11 +
.../contents/ui/ActionDelegate.qml | 25 +-
chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml | 229 +++++++++
.../contents/ui/ConversationDelegate.qml | 115 +++++
.../contents/ui/ConversationDelegateButton.qml | 77 +++
.../contents/ui/OutgoingDelegate.qml | 26 +-
chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml | 61 +++
chat/org.kde.ktp-chat/contents/ui/main.qml | 119 +++++
chat/org.kde.ktp-chat/metadata.desktop.cmake | 96 ++++
contact-applet/Messages.sh | 2 -
contact-applet/src/abstract-contact-delegate.cpp | 223 ---------
contact-applet/src/contact-delegate.cpp | 169 -------
{contact-applet => contact}/CMakeLists.txt | 7 +-
contact/Messages.sh | 2 +
.../plasma-applet-ktp-contact.desktop.cmake | 32 +-
contact/src/abstract-contact-delegate.cpp | 170 +++++++
.../src/abstract-contact-delegate.h | 12 +-
{contact-applet => contact}/src/applet_config.cpp | 80 ++--
{contact-applet => contact}/src/applet_config.h | 14 +-
{contact-applet => contact}/src/applet_config.ui | 0
contact/src/contact-delegate-compact.cpp | 173 +++++++
.../src/contact-delegate-compact.h | 25 +-
.../src/contact-wrapper.cpp | 7 +-
{contact-applet => contact}/src/contact-wrapper.h | 0
.../src/declarative/contents/frames/away.png | Bin 2295 -> 2295 bytes
.../src/declarative/contents/frames/busy.png | Bin 2284 -> 2284 bytes
.../src/declarative/contents/frames/offline.png | Bin 1852 -> 1852 bytes
.../src/declarative/contents/frames/online.png | Bin 2239 -> 2239 bytes
.../src/declarative/contents/ui/Avatar.qml | 2 +-
.../src/declarative/contents/ui/Contact.qml | 2 +-
.../src/declarative/contents/ui/DropDownMenu.qml | 2 +-
.../src/declarative/contents/ui/main.qml | 2 +-
.../src/telepathy-contact.cpp | 5 +-
.../src/telepathy-contact.h | 0
contactlist/CMakeLists.txt | 7 +
.../contents/ui/ContactDisplayName.qml | 2 +-
.../contents/ui/ContactList.qml | 41 +-
.../contents/ui/ExternalLabel.qml | 2 +-
.../contents/ui/ListContactDelegate.qml | 67 +--
.../org.kde.ktp-contactlist}/contents/ui/main.qml | 19 +-
.../org.kde.ktp-contactlist/metadata.desktop.cmake | 30 +-
declarative-plugin/CMakeLists.txt | 26 -
declarative-plugin/contact-list.cpp | 116 -----
declarative-plugin/contact-list.h | 56 ---
declarative-plugin/qmldir | 1 -
org.kde.ktp.contactlist/contents/frames/away.png | Bin 2295 -> 0 bytes
org.kde.ktp.contactlist/contents/frames/busy.png | Bin 2284 -> 0 bytes
.../contents/frames/offline.png | Bin 1852 -> 0 bytes
org.kde.ktp.contactlist/contents/frames/online.png | Bin 2239 -> 0 bytes
.../contents/ui/ContactList.qml | 98 ----
.../contents/ui/ListContactDelegate.qml | 104 ----
po/CMakeLists.txt | 8 +
...act.po => plasma_applet_org.kde.ktp-contact.po} | 54 +--
...act.po => plasma_applet_org.kde.ktp-contact.po} | 52 +-
po/ca at valencia/CMakeLists.txt | 2 +
.../plasma_applet_org.kde.ktp-contact.po} | 50 +-
po/cs/plasma_applet_ktp_contact.po | 59 ---
po/cs/plasma_applet_org.kde.ktp-contact.po | 30 ++
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
po/de/plasma_applet_ktp_contact.po | 56 ---
po/de/plasma_applet_org.kde.ktp-contact.po | 50 ++
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
po/fi/plasma_applet_ktp_contact.po | 61 ---
po/fi/plasma_applet_org.kde.ktp-contact.po | 55 +++
po/fr/plasma_applet_ktp_contact.po | 59 ---
po/fr/plasma_applet_org.kde.ktp-contact.po | 60 +++
...act.po => plasma_applet_org.kde.ktp-contact.po} | 50 +-
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
po/ia/CMakeLists.txt | 2 +
po/ia/plasma_applet_org.kde.ktp-contact.po | 30 ++
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
po/ja/plasma_applet_ktp_contact.po | 56 ---
po/ja/plasma_applet_org.kde.ktp-contact.po | 27 ++
po/kk/CMakeLists.txt | 2 +
po/kk/plasma_applet_org.kde.ktp-contact.po | 32 ++
po/km/CMakeLists.txt | 2 +
po/km/plasma_applet_org.kde.ktp-contact.po | 56 +++
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
po/mr/CMakeLists.txt | 2 +
po/mr/plasma_applet_org.kde.ktp-contact.po | 30 ++
...act.po => plasma_applet_org.kde.ktp-contact.po} | 33 +-
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
po/nl/plasma_applet_ktp_contact.po | 59 ---
po/nl/plasma_applet_org.kde.ktp-contact.po | 53 +++
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
po/pt/plasma_applet_ktp_contact.po | 54 ---
po/pt/plasma_applet_org.kde.ktp-contact.po | 48 ++
po/pt_BR/plasma_applet_ktp_contact.po | 59 ---
po/pt_BR/plasma_applet_org.kde.ktp-contact.po | 54 +++
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
po/sk/plasma_applet_ktp_contact.po | 57 ---
po/sk/plasma_applet_org.kde.ktp-contact.po | 28 ++
po/sl/plasma_applet_ktp_contact.po | 60 ---
po/sl/plasma_applet_org.kde.ktp-contact.po | 54 +++
po/sr/plasma_applet_ktp_contact.po | 69 ---
po/sr/plasma_applet_org.kde.ktp-contact.po | 32 ++
po/sr at ijekavian/plasma_applet_ktp_contact.po | 69 ---
.../plasma_applet_org.kde.ktp-contact.po | 32 ++
po/sr at ijekavianlatin/plasma_applet_ktp_contact.po | 69 ---
.../plasma_applet_org.kde.ktp-contact.po | 32 ++
po/sr at latin/plasma_applet_ktp_contact.po | 69 ---
po/sr at latin/plasma_applet_org.kde.ktp-contact.po | 32 ++
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
po/tr/CMakeLists.txt | 2 +
po/tr/plasma_applet_org.kde.ktp-contact.po | 30 ++
po/uk/plasma_applet_ktp_contact.po | 60 ---
po/uk/plasma_applet_org.kde.ktp-contact.po | 54 +++
po/vi/CMakeLists.txt | 2 +
po/vi/plasma_applet_org.kde.ktp-contact.po | 53 +++
po/wa/CMakeLists.txt | 2 +
po/wa/plasma_applet_org.kde.ktp-contact.po | 53 +++
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
...act.po => plasma_applet_org.kde.ktp-contact.po} | 48 +-
presence/CMakeLists.txt | 22 +
presence/Messages.sh | 4 +
presence/plasma-applet-ktp-presence.desktop.cmake | 57 +++
presence/src/presence-applet.cpp | 403 ++++++++++++++++
presence/src/presence-applet.h | 98 ++++
126 files changed, 3848 insertions(+), 2441 deletions(-)
--
ktp-contact-applet packaging
More information about the pkg-kde-commits
mailing list