[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:00:05 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=23a3147
The following commit has been merged in the master branch:
commit 23a314753c5c31cc4d07878b7074e8994beed45e
Merge: 1060f20a25f8d1dfef2fa4a59176de4321e7900a 5c6284934d02c70eb435d96ffd976a2c63469f4d
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Mon Oct 3 12:26:42 2011 +0100
Merge telepathy-accounts-kcm-plugins
Conflicts:
CMakeLists.txt
BUG: 282195
CMakeLists.txt | 11 +-
butterfly/CMakeLists.txt | 36 +++
{src => butterfly}/Messages.sh | 2 +-
butterfly/butterfly-account-ui-plugin.cpp | 61 ++++
.../butterfly-account-ui-plugin.h | 25 +-
.../butterfly-account-ui.cpp | 44 +--
.../butterfly-account-ui.h | 28 +-
.../kcmtelepathyaccounts_plugin_butterfly.desktop | 27 ++
.../main-options-widget.cpp | 40 ++-
.../main-options-widget.h | 27 +-
butterfly/main-options-widget.ui | 88 ++++++
cmake/modules/FindKCMTelepathyAccounts.cmake | 26 ++
gabble/CMakeLists.txt | 44 +++
{src => gabble}/Messages.sh | 2 +-
gabble/gabble-account-ui-plugin.cpp | 58 ++++
.../gabble-account-ui-plugin.h | 25 +-
gabble/gabble-account-ui.cpp | 103 +++++++
.../gabble-account-ui.h | 33 +--
gabble/kcmtelepathyaccounts_plugin_gabble.desktop | 42 +++
gabble/main-options-widget-facebook.cpp | 79 ++++++
.../main-options-widget-facebook.h | 30 +-
gabble/main-options-widget-facebook.ui | 84 ++++++
gabble/main-options-widget-googletalk.cpp | 48 ++++
.../main-options-widget-googletalk.h | 31 +--
gabble/main-options-widget-googletalk.ui | 65 +++++
.../main-options-widget.cpp | 42 ++-
.../main-options-widget.h | 28 +-
gabble/main-options-widget.ui | 72 +++++
gabble/proxy-settings-widget.cpp | 54 ++++
.../proxy-settings-widget.h | 27 +-
gabble/proxy-settings-widget.ui | 189 +++++++++++++
gabble/server-settings-widget.cpp | 55 ++++
.../server-settings-widget.h | 27 +-
gabble/server-settings-widget.ui | 165 +++++++++++
haze/CMakeLists.txt | 57 ++++
{src => haze}/Messages.sh | 2 +-
haze/aim-main-options-widget.cpp | 46 +++
.../aim-main-options-widget.h | 35 +--
haze/aim-main-options-widget.ui | 68 +++++
haze/aim-server-settings-widget.cpp | 53 ++++
.../aim-server-settings-widget.h | 29 +-
haze/aim-server-settings-widget.ui | 142 ++++++++++
haze/haze-account-ui-plugin.cpp | 79 ++++++
.../haze-account-ui-plugin.h | 27 +-
haze/haze-aim-account.cpp | 74 +++++
.../haze-aim-account.h | 34 +--
haze/haze-icq-account.cpp | 79 ++++++
.../haze-icq-account.h | 33 +--
haze/haze-myspaceim-account-ui.cpp | 72 +++++
.../haze-myspaceim-account-ui.h | 34 +--
haze/haze-skype-account-ui.cpp | 76 +++++
.../haze-skype-account-ui.h | 34 +--
haze/haze-yahoo-account.cpp | 66 +++++
.../haze-yahoo-account.h | 34 ++-
.../icq-main-options-widget.cpp | 40 ++-
.../icq-main-options-widget.h | 32 +--
haze/icq-main-options-widget.ui | 68 +++++
haze/icq-server-settings-widget.cpp | 51 ++++
.../icq-server-settings-widget.h | 29 +-
haze/icq-server-settings-widget.ui | 177 ++++++++++++
haze/kcmtelepathyaccounts_plugin_haze.desktop | 42 +++
.../myspaceim-advanced-settings-widget.cpp | 44 ++-
.../myspaceim-advanced-settings-widget.h | 28 +-
haze/myspaceim-advanced-settings-widget.ui | 83 ++++++
.../myspaceim-main-options-widget.cpp | 41 ++-
.../myspaceim-main-options-widget.h | 31 +--
haze/myspaceim-main-options-widget.ui | 78 ++++++
haze/skype-advanced-settings-widget.cpp | 47 ++++
.../skype-advanced-settings-widget.h | 28 +-
haze/skype-advanced-settings-widget.ui | 82 ++++++
haze/skype-main-options-widget.cpp | 65 +++++
.../skype-main-options-widget.h | 31 +--
haze/skype-main-options-widget.ui | 57 ++++
haze/yahoo-main-options-widget.cpp | 47 ++++
.../yahoo-main-options-widget.h | 35 +--
haze/yahoo-main-options-widget.ui | 72 +++++
haze/yahoo-server-settings-widget.cpp | 54 ++++
.../yahoo-server-settings-widget.h | 29 +-
haze/yahoo-server-settings-widget.ui | 221 +++++++++++++++
idle/CMakeLists.txt | 37 +++
{src => idle}/Messages.sh | 2 +-
idle/advanced-options-widget.cpp | 51 ++++
.../advanced-options-widget.h | 29 +-
idle/advanced-options-widget.ui | 136 +++++++++
idle/idle-account-ui-plugin.cpp | 60 ++++
.../idle-account-ui-plugin.h | 27 +-
idle/idle-account-ui.cpp | 75 +++++
.../idle-account-ui.h | 36 ++-
idle/kcmtelepathyaccounts_plugin_idle.desktop | 26 ++
idle/main-options-widget.cpp | 49 ++++
.../main-options-widget.h | 29 +-
idle/main-options-widget.ui | 89 ++++++
rakia/CMakeLists.txt | 38 +++
{src => rakia}/Messages.sh | 2 +-
rakia/kcmtelepathyaccounts_plugin_rakia.desktop | 42 +++
rakia/rakia-account-ui-plugin.cpp | 67 +++++
.../rakia-account-ui-plugin.h | 32 +--
rakia/rakia-account-ui.cpp | 129 +++++++++
.../rakia-account-ui.h | 37 ++-
rakia/rakia-advanced-options-widget.cpp | 130 +++++++++
.../rakia-advanced-options-widget.h | 34 +--
rakia/rakia-advanced-options-widget.ui | 307 +++++++++++++++++++++
rakia/rakia-main-options-widget.cpp | 52 ++++
.../rakia-main-options-widget.h | 33 +--
rakia/rakia-main-options-widget.ui | 89 ++++++
salut/CMakeLists.txt | 38 +++
{src => salut}/Messages.sh | 2 +-
salut/kcmtelepathyaccounts_plugin_salut.desktop | 42 +++
salut/salut-account-ui-plugin.cpp | 65 +++++
.../salut-account-ui-plugin.h | 32 +--
salut/salut-account-ui.cpp | 78 ++++++
.../salut-account-ui.h | 37 ++-
salut/salut-advanced-options-widget.cpp | 46 +++
.../salut-advanced-options-widget.h | 32 +--
salut/salut-advanced-options-widget.ui | 79 ++++++
salut/salut-main-options-widget.cpp | 55 ++++
.../salut-main-options-widget.h | 33 +--
salut/salut-main-options-widget.ui | 71 +++++
sunshine/CMakeLists.txt | 38 +++
{src => sunshine}/Messages.sh | 2 +-
.../kcmtelepathyaccounts_plugin_sunshine.desktop | 42 +++
sunshine/sunshine-account-ui-plugin.cpp | 63 +++++
.../sunshine-account-ui-plugin.h | 32 +--
sunshine/sunshine-account-ui.cpp | 82 ++++++
sunshine/sunshine-account-ui.h | 46 +++
sunshine/sunshine-advanced-options-widget.cpp | 58 ++++
.../sunshine-advanced-options-widget.h | 32 +--
sunshine/sunshine-advanced-options-widget.ui | 123 +++++++++
sunshine/sunshine-main-options-widget.cpp | 45 +++
.../sunshine-main-options-widget.h | 33 +--
sunshine/sunshine-main-options-widget.ui | 68 +++++
131 files changed, 6300 insertions(+), 916 deletions(-)
diff --cc CMakeLists.txt
index ee614dc,a3914e6..a48a7d7
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,9 -1,11 +1,10 @@@
-project (telepathy-accounts-kcm-plugins)
++project (telepathy-accounts-kcm)
+
# Add the modules we ship to the module path
SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
find_package (KDE4 REQUIRED)
-
find_package (TelepathyQt4 REQUIRED)
-find_package (KCMTelepathyAccounts REQUIRED)
# set some default settings
include (KDE4Defaults)
@@@ -15,8 -17,13 +16,14 @@@ add_definitions (${KDE4_DEFINITIONS}
include_directories (${KDE4_INCLUDES}
${TELEPATHY_QT4_INCLUDE_DIR}
- ${KCMTELEPATHYACCOUNTS_INCLUDE_DIR}
)
+add_subdirectory (src)
+add_subdirectory (data)
-
+ add_subdirectory (gabble)
+ add_subdirectory (butterfly)
+ add_subdirectory (idle)
+ add_subdirectory (haze)
+ add_subdirectory (rakia)
+ add_subdirectory (salut)
+ add_subdirectory (sunshine)
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list