[SCM] ktp-accounts-kcm packaging branch, master, updated. ubuntu/4%15.08.0-0ubuntu1-62-g66861ad
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jan 27 19:52:31 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=da299d7
The following commit has been merged in the master branch:
commit da299d706ca9856fbe8085b52125c55d3780eef2
Merge: 36655516dd943f76e3cd6ed3b139d871efeca0e0 890c4369c6b99863956ac8e4cc9fb033dc1ee840
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Jan 27 17:27:23 2016 +0100
Merge remote-tracking branch 'kde-extras/master'
.gitignore | 8 +
.reviewboardrc | 2 +
CMakeLists.txt | 51 ++
COPYING | 502 +++++++++++++++++
INSTALL | 18 +
README | 16 +
cmake/modules/COPYING-CMAKE-SCRIPTS | 22 +
cmake/modules/FindIntltool.cmake | 50 ++
data/CMakeLists.txt | 4 +
data/kaccounts/CMakeLists.txt | 9 +
data/kaccounts/disabled/CMakeLists.txt | 24 +
data/kaccounts/disabled/_README | 20 +
data/kaccounts/disabled/facebook-im.service.in | 25 +
.../disabled/ktp-haze-steam-mobile-im.service.in | 19 +
.../disabled/ktp-haze-steam-mobile.provider.in | 9 +
data/kaccounts/google-im.service.in | 30 +
data/kaccounts/ktp-gadugadu.provider.in | 10 +
data/kaccounts/ktp-generic-im.service.in | 7 +
data/kaccounts/ktp-generic.provider.in | 11 +
data/kaccounts/ktp-haze-aim-im.service.in | 20 +
data/kaccounts/ktp-haze-aim.provider.in | 9 +
data/kaccounts/ktp-haze-gadugadu-im.service.in | 21 +
data/kaccounts/ktp-haze-icq-im.service.in | 20 +
data/kaccounts/ktp-haze-icq.provider.in | 9 +
data/kaccounts/ktp-haze-sametime-im.service.in | 20 +
data/kaccounts/ktp-haze-sametime.provider.in | 9 +
data/kaccounts/ktp-haze-yahoo-im.service.in | 21 +
data/kaccounts/ktp-haze-yahoo.provider.in | 10 +
data/kaccounts/ktp-jabber-im.service.in | 20 +
data/kaccounts/ktp-jabber.provider.in | 9 +
data/kaccounts/ktp-kde-talk-im.service.in | 20 +
data/kaccounts/ktp-kde-talk.provider.in | 10 +
data/kaccounts/ktp-morse-telegram-im.service.in | 20 +
data/kaccounts/ktp-morse-telegram.provider.in | 9 +
data/kaccounts/ktp-sipe-haze-im.service.in | 20 +
data/kaccounts/ktp-sipe-haze.provider.in | 9 +
data/kaccounts/ktp-sipe-im.service.in | 20 +
data/kaccounts/ktp-sipe.provider.in | 9 +
data/profiles/bigbrownchunx-skype-dbus.profile | 8 +
data/profiles/facebook.profile | 30 +
data/profiles/gadugadu.profile | 8 +
data/profiles/google-talk.profile | 33 ++
data/profiles/irc.profile | 8 +
data/profiles/jabber.profile | 8 +
data/profiles/kde-talk.profile | 14 +
data/profiles/local-xmpp.profile | 8 +
data/profiles/msn-xmpp.profile | 16 +
data/profiles/msn.profile | 8 +
data/profiles/sipe-haze.profile | 8 +
data/profiles/sms.profile | 8 +
data/profiles/sofiasip-sip.profile | 8 +
data/profiles/steam.profile | 8 +
debian/changelog | 51 ++
debian/control | 7 +-
debian/copyright | 47 --
debian/kde-config-telepathy-accounts.install | 10 +-
debian/patches/ignore-ssl-error.patch | 32 ++
debian/patches/series | 1 +
debian/rules | 3 +
debian/watch | 2 +-
plugins/CMakeLists.txt | 11 +
plugins/butterfly/CMakeLists.txt | 39 ++
plugins/butterfly/Messages.sh | 4 +
plugins/butterfly/butterfly-account-ui-plugin.cpp | 55 ++
plugins/butterfly/butterfly-account-ui-plugin.h | 44 ++
plugins/butterfly/butterfly-account-ui.cpp | 45 ++
plugins/butterfly/butterfly-account-ui.h | 42 ++
.../ktpaccountskcm_plugin_butterfly.desktop.cmake | 56 ++
plugins/butterfly/main-options-widget.cpp | 47 ++
plugins/butterfly/main-options-widget.h | 44 ++
plugins/butterfly/main-options-widget.ui | 88 +++
plugins/gabble/CMakeLists.txt | 54 ++
plugins/gabble/Messages.sh | 4 +
plugins/gabble/gabble-account-ui-plugin.cpp | 51 ++
plugins/gabble/gabble-account-ui-plugin.h | 44 ++
plugins/gabble/gabble-account-ui.cpp | 120 ++++
plugins/gabble/gabble-account-ui.h | 48 ++
.../ktpaccountskcm_plugin_gabble.desktop.cmake | 100 ++++
plugins/gabble/main-options-widget-facebook.cpp | 92 ++++
plugins/gabble/main-options-widget-facebook.h | 46 ++
plugins/gabble/main-options-widget-facebook.ui | 88 +++
plugins/gabble/main-options-widget-googletalk.cpp | 46 ++
plugins/gabble/main-options-widget-googletalk.h | 45 ++
plugins/gabble/main-options-widget-googletalk.ui | 44 ++
plugins/gabble/main-options-widget-kde-talk.cpp | 95 ++++
plugins/gabble/main-options-widget-kde-talk.h | 51 ++
plugins/gabble/main-options-widget-kde-talk.ui | 75 +++
plugins/gabble/main-options-widget-msn.cpp | 61 +++
plugins/gabble/main-options-widget-msn.h | 45 ++
plugins/gabble/main-options-widget-msn.ui | 28 +
plugins/gabble/main-options-widget.cpp | 61 +++
plugins/gabble/main-options-widget.h | 43 ++
plugins/gabble/main-options-widget.ui | 64 +++
plugins/gabble/proxy-settings-widget.cpp | 47 ++
plugins/gabble/proxy-settings-widget.h | 44 ++
plugins/gabble/proxy-settings-widget.ui | 179 ++++++
plugins/gabble/server-settings-widget.cpp | 48 ++
plugins/gabble/server-settings-widget.h | 44 ++
plugins/gabble/server-settings-widget.ui | 162 ++++++
plugins/haze/CMakeLists.txt | 80 +++
plugins/haze/Messages.sh | 4 +
plugins/haze/aim-main-options-widget.cpp | 48 ++
plugins/haze/aim-main-options-widget.h | 44 ++
plugins/haze/aim-main-options-widget.ui | 61 +++
plugins/haze/aim-server-settings-widget.cpp | 47 ++
plugins/haze/aim-server-settings-widget.h | 43 ++
plugins/haze/aim-server-settings-widget.ui | 131 +++++
.../haze/groupwise-advanced-settings-widget.cpp | 41 ++
plugins/haze/groupwise-advanced-settings-widget.h | 42 ++
plugins/haze/groupwise-advanced-settings-widget.ui | 72 +++
plugins/haze/groupwise-main-options-widget.cpp | 46 ++
plugins/haze/groupwise-main-options-widget.h | 41 ++
plugins/haze/groupwise-main-options-widget.ui | 71 +++
plugins/haze/haze-account-ui-plugin.cpp | 88 +++
plugins/haze/haze-account-ui-plugin.h | 43 ++
plugins/haze/haze-aim-account.cpp | 63 +++
plugins/haze/haze-aim-account.h | 46 ++
plugins/haze/haze-groupwise-account.cpp | 63 +++
plugins/haze/haze-groupwise-account.h | 46 ++
plugins/haze/haze-icq-account.cpp | 69 +++
plugins/haze/haze-icq-account.h | 46 ++
plugins/haze/haze-msn-account.cpp | 54 ++
plugins/haze/haze-msn-account.h | 42 ++
plugins/haze/haze-myspaceim-account-ui.cpp | 63 +++
plugins/haze/haze-myspaceim-account-ui.h | 46 ++
plugins/haze/haze-sipe-account.cpp | 71 +++
plugins/haze/haze-sipe-account.h | 46 ++
plugins/haze/haze-skype-account-ui.cpp | 66 +++
plugins/haze/haze-skype-account-ui.h | 46 ++
plugins/haze/haze-steam-account.cpp | 46 ++
plugins/haze/haze-steam-account.h | 42 ++
plugins/haze/haze-yahoo-account.cpp | 63 +++
plugins/haze/haze-yahoo-account.h | 48 ++
plugins/haze/icq-main-options-widget.cpp | 46 ++
plugins/haze/icq-main-options-widget.h | 42 ++
plugins/haze/icq-main-options-widget.ui | 62 +++
plugins/haze/icq-server-settings-widget.cpp | 68 +++
plugins/haze/icq-server-settings-widget.h | 45 ++
plugins/haze/icq-server-settings-widget.ui | 156 ++++++
.../haze/ktpaccountskcm_plugin_haze.desktop.cmake | 100 ++++
plugins/haze/msn-main-options-widget.cpp | 46 ++
plugins/haze/msn-main-options-widget.h | 43 ++
plugins/haze/msn-main-options-widget.ui | 79 +++
.../haze/myspaceim-advanced-settings-widget.cpp | 41 ++
plugins/haze/myspaceim-advanced-settings-widget.h | 42 ++
plugins/haze/myspaceim-advanced-settings-widget.ui | 72 +++
plugins/haze/myspaceim-main-options-widget.cpp | 46 ++
plugins/haze/myspaceim-main-options-widget.h | 41 ++
plugins/haze/myspaceim-main-options-widget.ui | 72 +++
plugins/haze/sipe-advanced-settings-widget.cpp | 50 ++
plugins/haze/sipe-advanced-settings-widget.h | 42 ++
plugins/haze/sipe-advanced-settings-widget.ui | 157 ++++++
plugins/haze/sipe-main-options-widget.cpp | 46 ++
plugins/haze/sipe-main-options-widget.h | 41 ++
plugins/haze/sipe-main-options-widget.ui | 72 +++
plugins/haze/skype-advanced-settings-widget.cpp | 43 ++
plugins/haze/skype-advanced-settings-widget.h | 42 ++
plugins/haze/skype-advanced-settings-widget.ui | 82 +++
plugins/haze/skype-main-options-widget.cpp | 63 +++
plugins/haze/skype-main-options-widget.h | 41 ++
plugins/haze/skype-main-options-widget.ui | 51 ++
plugins/haze/steam-main-options-widget.cpp | 47 ++
plugins/haze/steam-main-options-widget.h | 41 ++
plugins/haze/steam-main-options-widget.ui | 96 ++++
plugins/haze/yahoo-main-options-widget.cpp | 68 +++
plugins/haze/yahoo-main-options-widget.h | 44 ++
plugins/haze/yahoo-main-options-widget.ui | 66 +++
plugins/haze/yahoo-server-settings-widget.cpp | 56 ++
plugins/haze/yahoo-server-settings-widget.h | 43 ++
plugins/haze/yahoo-server-settings-widget.ui | 205 +++++++
plugins/idle/CMakeLists.txt | 42 ++
plugins/idle/Messages.sh | 4 +
plugins/idle/advanced-options-widget.cpp | 44 ++
plugins/idle/advanced-options-widget.h | 44 ++
plugins/idle/advanced-options-widget.ui | 124 +++++
plugins/idle/idle-account-ui-plugin.cpp | 53 ++
plugins/idle/idle-account-ui-plugin.h | 44 ++
plugins/idle/idle-account-ui.cpp | 65 +++
plugins/idle/idle-account-ui.h | 47 ++
.../idle/ktpaccountskcm_plugin_idle.desktop.cmake | 56 ++
plugins/idle/main-options-widget.cpp | 58 ++
plugins/idle/main-options-widget.h | 44 ++
plugins/idle/main-options-widget.ui | 82 +++
plugins/kaccounts/CMakeLists.txt | 33 ++
plugins/kaccounts/kaccounts-ui-provider.cpp | 451 +++++++++++++++
plugins/kaccounts/kaccounts-ui-provider.h | 68 +++
plugins/morse/CMakeLists.txt | 41 ++
plugins/morse/Messages.sh | 4 +
.../ktpaccountskcm_plugin_morse.desktop.cmake | 50 ++
plugins/morse/main-options-widget.cpp | 48 ++
plugins/morse/main-options-widget.h | 44 ++
plugins/morse/main-options-widget.ui | 54 ++
plugins/morse/morse-account-ui-plugin.cpp | 54 ++
plugins/morse/morse-account-ui-plugin.h | 44 ++
plugins/morse/telegram-account-ui.cpp | 44 ++
plugins/morse/telegram-account-ui.h | 42 ++
plugins/pintxo/CMakeLists.txt | 54 ++
plugins/pintxo/Messages.sh | 4 +
.../ktpaccountskcm_plugin_pintxo.desktop.cmake | 96 ++++
plugins/pintxo/main-options-widget.cpp | 55 ++
plugins/pintxo/main-options-widget.h | 47 ++
plugins/pintxo/main-options-widget.ui | 90 +++
plugins/pintxo/modem-combobox.cpp | 79 +++
plugins/pintxo/modem-combobox.h | 43 ++
plugins/pintxo/pintxo-account-ui-plugin.cpp | 55 ++
plugins/pintxo/pintxo-account-ui-plugin.h | 44 ++
plugins/pintxo/pintxo-account-ui.cpp | 45 ++
plugins/pintxo/pintxo-account-ui.h | 42 ++
plugins/rakia/CMakeLists.txt | 40 ++
plugins/rakia/Messages.sh | 4 +
.../ktpaccountskcm_plugin_rakia.desktop.cmake | 100 ++++
plugins/rakia/rakia-account-ui-plugin.cpp | 63 +++
plugins/rakia/rakia-account-ui-plugin.h | 45 ++
plugins/rakia/rakia-account-ui.cpp | 119 ++++
plugins/rakia/rakia-account-ui.h | 46 ++
plugins/rakia/rakia-advanced-options-widget.cpp | 138 +++++
plugins/rakia/rakia-advanced-options-widget.h | 47 ++
plugins/rakia/rakia-advanced-options-widget.ui | 321 +++++++++++
plugins/rakia/rakia-main-options-widget.cpp | 54 ++
plugins/rakia/rakia-main-options-widget.h | 43 ++
plugins/rakia/rakia-main-options-widget.ui | 89 +++
plugins/salut/CMakeLists.txt | 41 ++
plugins/salut/Messages.sh | 4 +
.../ktpaccountskcm_plugin_salut.desktop.cmake | 100 ++++
plugins/salut/salut-account-ui-plugin.cpp | 61 +++
plugins/salut/salut-account-ui-plugin.h | 45 ++
plugins/salut/salut-account-ui.cpp | 68 +++
plugins/salut/salut-account-ui.h | 46 ++
plugins/salut/salut-advanced-options-widget.cpp | 42 ++
plugins/salut/salut-advanced-options-widget.h | 43 ++
plugins/salut/salut-advanced-options-widget.ui | 79 +++
plugins/salut/salut-main-options-widget.cpp | 91 ++++
plugins/salut/salut-main-options-widget.h | 43 ++
plugins/salut/salut-main-options-widget.ui | 71 +++
plugins/sipe/CMakeLists.txt | 42 ++
plugins/sipe/Messages.sh | 4 +
.../sipe/ktpaccountskcm_plugin_sipe.desktop.cmake | 94 ++++
plugins/sipe/sipe-account-ui-plugin.cpp | 54 ++
plugins/sipe/sipe-account-ui-plugin.h | 43 ++
plugins/sipe/sipe-account-ui.cpp | 65 +++
plugins/sipe/sipe-account-ui.h | 42 ++
plugins/sipe/sipe-advanced-options-widget.cpp | 46 ++
plugins/sipe/sipe-advanced-options-widget.h | 42 ++
plugins/sipe/sipe-advanced-options-widget.ui | 150 +++++
plugins/sipe/sipe-main-options-widget.cpp | 71 +++
plugins/sipe/sipe-main-options-widget.h | 44 ++
plugins/sipe/sipe-main-options-widget.ui | 71 +++
plugins/sunshine/CMakeLists.txt | 43 ++
plugins/sunshine/Messages.sh | 4 +
.../ktpaccountskcm_plugin_sunshine.desktop.cmake | 100 ++++
plugins/sunshine/sunshine-account-ui-plugin.cpp | 56 ++
plugins/sunshine/sunshine-account-ui-plugin.h | 45 ++
plugins/sunshine/sunshine-account-ui.cpp | 72 +++
plugins/sunshine/sunshine-account-ui.h | 46 ++
.../sunshine/sunshine-advanced-options-widget.cpp | 54 ++
.../sunshine/sunshine-advanced-options-widget.h | 43 ++
.../sunshine/sunshine-advanced-options-widget.ui | 111 ++++
plugins/sunshine/sunshine-main-options-widget.cpp | 48 ++
plugins/sunshine/sunshine-main-options-widget.h | 43 ++
plugins/sunshine/sunshine-main-options-widget.ui | 58 ++
src/CMakeLists.txt | 57 ++
.../AbstractAccountParametersWidget | 7 +
src/KCMTelepathyAccounts/AbstractAccountUi | 7 +
src/KCMTelepathyAccounts/AbstractAccountUiPlugin | 7 +
src/KCMTelepathyAccounts/AccountEditWidget | 7 +
src/KCMTelepathyAccounts/CMakeLists.txt | 107 ++++
src/KCMTelepathyAccounts/ConnectionManagerItem | 7 +
.../GenericAdvancedOptionsWidget | 6 +
src/KCMTelepathyAccounts/ParameterEditModel | 7 +
src/KCMTelepathyAccounts/ParameterEditWidget | 7 +
src/KCMTelepathyAccounts/PluginManager | 7 +
src/KCMTelepathyAccounts/ProtocolItem | 7 +
src/KCMTelepathyAccounts/ProtocolParameterValue | 6 +
src/KCMTelepathyAccounts/ProtocolSelectWidget | 7 +
src/KCMTelepathyAccounts/ValidatedLineEdit | 7 +
.../abstract-account-parameters-widget.cpp | 188 +++++++
.../abstract-account-parameters-widget.h | 98 ++++
.../abstract-account-ui-plugin.cpp | 69 +++
.../abstract-account-ui-plugin.h | 56 ++
src/KCMTelepathyAccounts/abstract-account-ui.cpp | 80 +++
src/KCMTelepathyAccounts/abstract-account-ui.h | 67 +++
src/KCMTelepathyAccounts/account-edit-widget.cpp | 305 +++++++++++
src/KCMTelepathyAccounts/account-edit-widget.h | 84 +++
src/KCMTelepathyAccounts/account-edit-widget.ui | 98 ++++
src/KCMTelepathyAccounts/dictionary.cpp | 101 ++++
src/KCMTelepathyAccounts/dictionary.h | 45 ++
src/KCMTelepathyAccounts/feedback-widget.cpp | 64 +++
src/KCMTelepathyAccounts/feedback-widget.h | 47 ++
.../generic-advanced-options-widget.cpp | 92 ++++
.../generic-advanced-options-widget.h | 53 ++
.../kcm_telepathy_accounts_export.h | 39 ++
.../ktpaccountskcminternal-accountuiplugin.desktop | 49 ++
.../parameter-edit-delegate.cpp | 223 ++++++++
src/KCMTelepathyAccounts/parameter-edit-delegate.h | 56 ++
src/KCMTelepathyAccounts/parameter-edit-model.cpp | 314 +++++++++++
src/KCMTelepathyAccounts/parameter-edit-model.h | 93 ++++
src/KCMTelepathyAccounts/parameter-edit-widget.cpp | 80 +++
src/KCMTelepathyAccounts/parameter-edit-widget.h | 53 ++
src/KCMTelepathyAccounts/parameter-edit-widget.ui | 30 +
src/KCMTelepathyAccounts/parameter-item.cpp | 124 +++++
src/KCMTelepathyAccounts/parameter-item.h | 71 +++
src/KCMTelepathyAccounts/plugin-manager.cpp | 106 ++++
src/KCMTelepathyAccounts/plugin-manager.h | 55 ++
src/KCMTelepathyAccounts/profile-item.cpp | 92 ++++
src/KCMTelepathyAccounts/profile-item.h | 62 +++
src/KCMTelepathyAccounts/profile-list-model.cpp | 227 ++++++++
src/KCMTelepathyAccounts/profile-list-model.h | 75 +++
src/KCMTelepathyAccounts/profile-select-widget.cpp | 118 ++++
src/KCMTelepathyAccounts/profile-select-widget.h | 63 +++
src/KCMTelepathyAccounts/profile-select-widget.ui | 21 +
.../simple-profile-select-widget.cpp | 110 ++++
.../simple-profile-select-widget.h | 62 +++
.../simple-profile-select-widget.ui | 201 +++++++
src/KCMTelepathyAccounts/unsigned-integer-edit.cpp | 90 +++
src/KCMTelepathyAccounts/unsigned-integer-edit.h | 56 ++
src/KCMTelepathyAccounts/validated-line-edit.cpp | 188 +++++++
src/KCMTelepathyAccounts/validated-line-edit.h | 67 +++
src/Messages.sh | 4 +
src/account-identity-dialog.cpp | 82 +++
src/account-identity-dialog.h | 59 ++
src/account-identity-dialog.ui | 107 ++++
src/accounts-list-delegate.cpp | 280 ++++++++++
src/accounts-list-delegate.h | 50 ++
src/add-account-assistant.cpp | 339 ++++++++++++
src/add-account-assistant.h | 68 +++
src/avatar-button.cpp | 202 +++++++
src/avatar-button.h | 61 +++
src/change-icon-button.cpp | 68 +++
src/change-icon-button.h | 49 ++
src/edit-account-dialog.cpp | 213 ++++++++
src/edit-account-dialog.h | 56 ++
src/edit-display-name-button.cpp | 163 ++++++
src/edit-display-name-button.h | 49 ++
src/kcm-telepathy-accounts.cpp | 606 +++++++++++++++++++++
src/kcm-telepathy-accounts.h | 119 ++++
src/kcm_ktp_accounts.desktop | 109 ++++
src/main-widget.ui | 225 ++++++++
src/salut-details-dialog.cpp | 102 ++++
src/salut-details-dialog.h | 53 ++
src/salut-enabler.cpp | 310 +++++++++++
src/salut-enabler.h | 67 +++
src/salut-message-widget.cpp | 106 ++++
src/salut-message-widget.h | 41 ++
src/settings-im-and-voip.desktop | 95 ++++
src/version.h.in | 1 +
345 files changed, 21744 insertions(+), 54 deletions(-)
diff --cc CMakeLists.txt
index 0000000,7f5ab93..1884dff
mode 000000,100644..100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,0 -1,49 +1,51 @@@
+ project (ktp-accounts-kcm)
+
+ cmake_minimum_required(VERSION 2.8.12)
+
+ find_package(ECM 1.0.0 REQUIRED NO_MODULE)
+
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+
+ find_package(Qt5 5.2.0 CONFIG REQUIRED Core Widgets DBus)
+ find_package(KF5 5.11 REQUIRED KCMUtils KIO I18n WidgetsAddons Codecs CoreAddons ConfigWidgets IconThemes ItemViews)
+
+ # KDE Application Version, managed by release script
+ set (KDE_APPLICATIONS_VERSION_MAJOR "15")
-set (KDE_APPLICATIONS_VERSION_MINOR "08")
-set (KDE_APPLICATIONS_VERSION_MICRO "3")
++set (KDE_APPLICATIONS_VERSION_MINOR "12")
++set (KDE_APPLICATIONS_VERSION_MICRO "0")
+
+ set(KTP_ACCOUNTS_KCM_SONUMBER "9")
+ set(KTP_ACCOUNTS_KCM_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
+
+ set(IS_KTP_INTERNAL_MODULE TRUE)
+
+ find_package (TelepathyQt5 REQUIRED)
+ find_package (KAccounts REQUIRED)
+ find_package (Intltool REQUIRED) #needed to generate service and provider files
+
+ set(CMAKE_MODULE_PATH ${KACCOUNTS_MACROS_PATH} ${CMAKE_MODULE_PATH}) #for KAccountsMacros
+
+ # make some more macros available
+ # include (MacroLibrary)
+
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+ include(KDEFrameworkCompilerSettings)
+ include(KDECompilerSettings)
+ include(ECMInstallIcons)
+ include(FeatureSummary)
+ include(KAccountsMacros)
+
+ add_definitions (
+ # -DQT_NO_CAST_FROM_ASCII
+ -DQT_NO_KEYWORDS
+ )
+
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src
+ ${TELEPATHY_QT5_INCLUDE_DIR})
+
+ add_subdirectory (src)
+ add_subdirectory (data)
+ add_subdirectory (plugins)
++
++feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --cc debian/changelog
index 3921889,009212a..0121661
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,58 -1,54 +1,109 @@@
+ktp-accounts-kcm (4:15.12.0-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (15.08.1).
+ * New upstream release (15.08.2).
+ * New upstream release (15.08.3).
+ * New upstream release (15.12.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 16 Dec 2015 16:11:12 +0100
+
+ktp-accounts-kcm (4:15.08.0-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+
+ -- Clive Johnston <clivejo at aol.com> Wed, 26 Aug 2015 17:41:01 +0100
+
+ktp-accounts-kcm (4:15.07.90-0ubuntu1) wily; urgency=medium
+
+ * new upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 18 Aug 2015 11:16:53 +0100
+
+ ktp-accounts-kcm (15.08.3-2) unstable; urgency=medium
+
+ * Update libkaccounts-dev Build-Depends to >= 15.08.3 (Closes: #809282)
+
+ -- Diane Trout <diane at ghic.org> Sun, 03 Jan 2016 21:20:57 -0800
+
+ ktp-accounts-kcm (15.08.3-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Diane Trout <diane at ghic.org> Wed, 02 Dec 2015 21:26:46 -0800
+
+ ktp-accounts-kcm (15.08.2-1) unstable; urgency=medium
+
+ * Update watch file for KTps move to Applications
+ * New upstream release.
+ * Update build dependencies to include:
+ - qtbase5-dev, extra-cmake-modules, libtelepathy-qt5-dev,
+ libsignon-qt5-dev, libkaccounts-qt5-dev,
+ and several libkf5 libraries.
+ * Update kde-config-telepath-accounts.install with
+ new library locations and new service file locations.
+ * Remove po/* block from copyright file.
+ * Update for rename of ktpcommoninternalsprivate-dev to libktp-dev
+ * Use dhmk from pkg-kde-tools to build ktp.
+ * Change maintainer to debian-qt-kde list to support using dhmk.
+ * Add KDE's unstable download url to watch file
+ * override_dh_install and not override_dh_auto_install
+
+ -- Diane Trout <diane at ghic.org> Sat, 07 Nov 2015 10:34:07 -0800
+
+ktp-accounts-kcm (15.08.0-1~) UNRELEASED; urgency=medium
+
+ [ Diane Trout ]
+ * New upstream release.
+ * Update libktpcommoninternalsprivate-dev build-dep to 0.8.80
+ * Change kde-telepathy-data to source:Upstream-Version
+
+ [ Maximiliano Curia ]
+ * Update watch file.
+ * New upstream release (15.04.1).
+ * New upstream release (15.04.2).
+ * New upstream release (15.04.3).
+ * New upstream release (15.08.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 04 Sep 2015 19:20:48 +0200
+
+ktp-accounts-kcm (15.04.2-0ubuntu1) wily; urgency=medium
+
+ * New upstream release.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Tue, 09 Jun 2015 19:27:18 +0200
+
+ktp-accounts-kcm (15.04.0-0ubuntu1) UNRELEASED; urgency=medium
+
+ * KDE Frameworks 5 port
+
+ -- Harald Sitter <sitter at kde.org> Mon, 09 Mar 2015 11:12:07 +0100
+
+ ktp-accounts-kcm (0.9.0-2) unstable; urgency=medium
+
+ * Apply KDE Homepage update patch from Matthew Cope.
+ * Add ignore-ssl-error.patch to make it easier to deal
+ with telepathy-rakia's ignoring standard places for
+ SSL cetificate authorities.
+
+ -- Diane Trout <diane at ghic.org> Tue, 02 Jun 2015 21:12:18 -0700
+
+ ktp-accounts-kcm (0.9.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update libktpcommoninternalsprivate-dev build-dep to 0.9.0
+ * Change kde-telepathy-data to source:Upstream-Version
+ * Merged kubuntu changes by Jonathan Riddell
+ * Update Standards-Version to 3.9.6. No changes neede.
+ * Update debian/watch file to use http://download.kde.org
+
+ -- Diane Trout <diane at ghic.org> Sat, 25 Apr 2015 20:16:17 -0700
+
+ktp-accounts-kcm (0.9.0-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 28 Oct 2014 13:14:00 +0100
+
ktp-accounts-kcm (0.8.1-1) unstable; urgency=medium
* New upstream release.
diff --cc debian/control
index e2d3357,4d9ddb4..15c39e7
--- a/debian/control
+++ b/debian/control
@@@ -1,34 -1,31 +1,35 @@@
Source: ktp-accounts-kcm
Section: kde
Priority: optional
-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Maintainer: Debian/Kubuntu KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+ Uploaders: Diane Trout <diane at ghic.org>, Michał Zając <quintasan at kubuntu.org>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 9),
- pkg-kde-tools (>= 0.9),
- libtelepathy-qt5-dev (>= 0.9.3),
- cmake (>= 2.8),
- kio-dev,
- libaccounts-glib-dev,
- libtelepathy-logger-dev,
- libtelepathy-logger-qt-dev,
- libktp-dev (>= 15.03),
- libkaccounts-dev (>= 15.08.3),
- libaccounts-qt5-dev (>= 1.10),
- libkf5kcmutils-dev,
- libkf5i18n-dev,
- libkf5itemviews-dev,
- libkf5iconthemes-dev,
- libkf5widgetsaddons-dev,
- libsignon-qt5-dev (>= 8.55),
- extra-cmake-modules,
- intltool
+Build-Depends: cmake (>= 2.8.12~),
+ debhelper (>= 9),
+ extra-cmake-modules (>= 1.0.0~),
+ intltool,
+ kio-dev (>= 5.11~),
+ libaccounts-glib-dev,
+ libaccounts-qt5-dev (>= 1.10~),
+ libkaccounts-dev (>= 4:15.07),
+ libkf5codecs-dev (>= 5.11~),
+ libkf5configwidgets-dev (>= 5.11~),
+ libkf5coreaddons-dev (>= 5.11~),
+ libkf5i18n-dev (>= 5.11~),
+ libkf5iconthemes-dev (>= 5.11~),
+ libkf5itemviews-dev (>= 5.11~),
+ libkf5kcmutils-dev (>= 5.11~),
+ libkf5widgetsaddons-dev (>= 5.11~),
- libktp-dev (>= 0.9.0),
++ libktp-dev (>= 15.03),
+ libsignon-qt5-dev (>= 8.55~),
+ libtelepathy-logger-dev,
- libtelepathy-logger-qt5-dev,
++ libtelepathy-logger-qt-dev,
+ libtelepathy-qt5-dev (>= 0.9.3),
+ pkg-kde-tools (>= 0.9),
+ qtbase5-dev (>= 5.4)
Standards-Version: 3.9.6
- Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-accounts-kcm
+ Homepage: https://projects.kde.org/projects/kde/kdenetwork/ktp-accounts-kcm
Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-accounts-kcm.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/ktp-accounts-kcm.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-extras/kde-telepathy/ktp-accounts-kcm.git
Package: kde-config-telepathy-accounts
Architecture: any
diff --cc debian/watch
index c236142,9875e43..c0cd8ce
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,3 +1,3 @@@
version=3
-http://download.kde.org/stable/applications/([\d.]+)/src/ktp-accounts-kcm-([\d.]+).tar.(?:bz2|xz)
-http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-accounts-kcm-([\d.]+).tar.(?:bz2|xz)
+
- http://download.kde.org/stable/applications/([\d.]+)/src/ktp-accounts-kcm-([\d.]+)\.tar\.xz
++http://download.kde.org/stable/applications/([\d.]+)/src/ktp-accounts-kcm-([\d.]+)\.tar\.(?:bz2|xz)
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list