[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=54d0638

The following commit has been merged in the master branch:
commit 54d0638636e6321248c5fafcca37ac03b0588a38
Merge: 03e91062039b4bfcedaa527ed80ac3f6530c4a6b 47b8df5323cfbf285681aae9ef6886641ac00771
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sun Apr 13 16:07:45 2014 +0200

    Merge remote-tracking branch 'origin/master' into frameworks
    
    Conflicts:
    	CMakeLists.txt
    	KTp/Declarative/qml-plugins.cpp

 CMakeLists.txt                                     |  2 +-
 KTp/Declarative/conversation.cpp                   | 25 ++-----
 KTp/Declarative/conversation.h                     | 15 ++--
 KTp/Declarative/qml-plugins.cpp                    |  4 +-
 .../plugins/tplogger/pending-tp-logger-logs.cpp    |  7 ++
 KTp/Models/rooms-model.cpp                         |  1 +
 KTp/Models/text-channel-watcher-proxy-model.cpp    | 24 ++++++-
 KTp/core.cpp                                       |  1 +
 KTp/global-presence.cpp                            | 82 ++++++++++++++++++++++
 KTp/global-presence.h                              | 29 ++++++++
 .../datasourceplugin/im-persons-data-source.cpp    | 31 ++++++--
 11 files changed, 181 insertions(+), 40 deletions(-)

diff --cc CMakeLists.txt
index 5d85ead,8d4ea59..1d94575
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -9,40 -8,30 +9,40 @@@ set (CMAKE_MODULE_PAT
  )
  cmake_policy(SET CMP0002 OLD)
  
- set (KTP_VERSION "0.7.80")
+ set (KTP_VERSION "0.8.0")
  # Bump for every 0.x release, or whenever BC changes
 -set (KTP_SONUMBER 7)
 -set (KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "4")
 -
 -find_package (KDE4 REQUIRED)
 -find_package (TelepathyQt4 0.9.2.1 REQUIRED)
 -find_package (TelepathyLoggerQt4)
 -find_package (KPeople 0.2.1)
 -find_package (KdepimLibs)
 -
 -# set some default settings
 -include (KDE4Defaults)
 -
 -# make some more macros available
 -include (MacroLibrary)
 -
 -macro_log_feature(KPEOPLE_FOUND "KPeople" "Support for KDE Contact Aggregation" "https://projects.kde.org/libkpeople" FALSE "" "")
 -macro_log_feature(KDEPIMLIBS_FOUND "KDE-PIM Libraries" "Support for Contact Aggregation" "https://projects.kde.org/kdepimlibs" FALSE "" "")
 -macro_log_feature(TELEPATHY_LOGGER_QT4_FOUND "TelepatyLoggerQt4" "Qt bindings for TelepathyLogger. This is needed to provide access to chat logs. HIGHLY recommended" "http://projects.kde.org/telepathy-logger-qt" FALSE "" "")
 -macro_display_feature_log()
 -
 -
 -add_definitions (${KDE4_DEFINITIONS}
 +set (KTP_SONUMBER 9)
 +set (KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "5")
 +
 +find_package (Qt5 REQUIRED CONFIG COMPONENTS Qml Test)
 +find_package (KF5 REQUIRED CONFIG COMPONENTS KCMUtils NotifyConfig TextEditor Wallet KDE4Support)
 +find_package (TelepathyQt5 0.9.2.1 REQUIRED)
 +find_package (TelepathyLoggerQt5 QUIET)
 +find_package (KPeople 0.3 QUIET)
 +
 +include(KDEInstallDirs)
 +include(KDECMakeSettings)
 +include(KDECompilerSettings)
 +include(ECMPackageConfigHelpers)
 +include(ECMMarkNonGuiExecutable)
 +include(ECMPackageConfigHelpers)
 +include(ECMInstallIcons)
 +include(CMakePackageConfigHelpers)
 +include(WriteBasicConfigVersionFile)
 +include(CheckIncludeFiles)
 +include(FeatureSummary)
 +
 +set_package_properties(KPeople PROPERTIES DESCRIPTION "Support for KDE Contact Aggregation"
 +                       URL "https://projects.kde.org/libkpeople"
 +                       TYPE OPTIONAL
 +                      )
 +set_package_properties(TelepathyLoggerQt5 PROPERTIES DESCRIPTION "Qt bindings for TelepathyLogger. This is needed to provide access to chat logs. HIGHLY recommended"
 +                       URL "http://projects.kde.org/telepathy-logger-qt"
 +                       TYPE OPTIONAL
 +                      )
 +
 +
 +add_definitions (
                   -DQT_NO_CAST_FROM_ASCII
                   -DQT_NO_KEYWORDS
  )
diff --cc KTp/Declarative/qml-plugins.cpp
index 74b5b0c,f074cd4..ce5e165
--- a/KTp/Declarative/qml-plugins.cpp
+++ b/KTp/Declarative/qml-plugins.cpp
@@@ -18,11 -18,11 +18,10 @@@
      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
  
- 
  #include "qml-plugins.h"
  
 -#include <QtDeclarative/QDeclarativeItem>
 -#include <QtDeclarative/QDeclarativeEngine>
 -#include <QtDeclarative/QDeclarativeContext>
 +#include <QQmlEngine>
 +#include <QQmlContext>
  
  #include "conversation.h"
  #include "conversations-model.h"
@@@ -33,8 -33,8 +32,9 @@@
  #include "filtered-pinned-contacts-proxy-model.h"
  #include "telepathy-manager.h"
  
 +#include <TelepathyQt/PendingChannelRequest>
  #include "KTp/types.h"
+ #include "KTp/global-presence.h"
  #include "KTp/Models/contacts-filter-model.h"
  #include "KTp/Models/contacts-model.h"
  #include "KTp/Models/accounts-list-model.h"
@@@ -63,9 -62,10 +63,11 @@@ void QmlPlugins::registerTypes(const ch
      qmlRegisterUncreatableType<MessagesModel> (uri, 0, 1, "MessagesModel",
          QLatin1String("It will be created once the conversation is created"));
  
+     qmlRegisterType<KTp::GlobalPresence> (uri, 0, 1, "PresenceManager");
+ 
      qmlRegisterType<TelepathyManager>();
      qmlRegisterType<ConversationsModel>();
 +    qmlRegisterType<Tp::PendingChannelRequest>();
      qRegisterMetaType<Tp::AccountManagerPtr>();
      qRegisterMetaType<KTp::ContactPtr>();
      qRegisterMetaType<Tp::AccountPtr>();

-- 
ktp-common-internals packaging