[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=2b13d08

The following commit has been merged in the master branch:
commit 2b13d0825c8cd53de1891b25def06c9fadc13443
Merge: 233607d2465b04fc5be6cce461d1287002c0c50a d8943f03ae609e0bb09a3a0793a74dd06f5141d6
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sat Nov 22 09:29:05 2014 -0800

    Merge branch 'master' into frameworks
    
    Conflicts:
    	kded/CMakeLists.txt

 cmake/DbusActivationMacros.cmake                  | 31 ++++++++++++++++++++++
 cmake/{macros.cmake => DbusInterfaceMacros.cmake} |  0
 core/CMakeLists.txt                               |  2 +-
 kcm/kcm_kdeconnect.desktop                        |  2 +-
 kded/CMakeLists.txt                               | 15 ++++++-----
 kded/org.kde.kdeconnect.service.in                |  3 +++
 plugins/battery/CMakeLists.txt                    |  2 +-
 plugins/kdeconnect.notifyrc                       | 32 +++++++++++++++++++++++
 plugins/notifications/CMakeLists.txt              |  3 ++-
 plugins/sftp/CMakeLists.txt                       |  2 +-
 plugins/sftp/kdeconnect_sftp.desktop              |  2 +-
 plugins/share/kdeconnect_share.desktop            |  2 +-
 12 files changed, 82 insertions(+), 14 deletions(-)

diff --cc kded/CMakeLists.txt
index 764efd3,4c4e46b..7560ae3
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@@ -1,15 -1,13 +1,16 @@@
  include_directories(${CMAKE_SOURCE_DIR})
+ 
 -kde4_add_executable(kdeconnectd kdeconnectd.cpp)
 -target_link_libraries(kdeconnectd kdeconnectcore ${KDE4_KDEUI_LIBS})
 -install(TARGETS kdeconnectd DESTINATION ${LIBEXEC_INSTALL_DIR})
 +add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-kded")
  
 -kde4_add_plugin(kded_kdeconnect kded.cpp)
 -target_link_libraries(kded_kdeconnect ${KDE4_KDECORE_LIBS})
 +configure_file(config-kded.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kded.h)
- 
- add_executable(kdeconnectd kdeconnectd.cpp)
- target_link_libraries(kdeconnectd kdeconnectcore KF5::DBusAddons KF5::ConfigWidgets)
- 
 +add_library(kded_kdeconnect MODULE kded.cpp)
- 
 +target_link_libraries(kded_kdeconnect KF5::Service KF5::DBusAddons)
- 
- install(TARGETS kdeconnectd DESTINATION ${LIBEXEC_INSTALL_DIR})
  install(TARGETS kded_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR})
  install(FILES kdeconnect.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
+ 
++add_executable(kdeconnectd kdeconnectd.cpp)
++target_link_libraries(kdeconnectd kdeconnectcore KF5::DBusAddons KF5::ConfigWidgets)
++install(TARGETS kdeconnectd DESTINATION ${LIBEXEC_INSTALL_DIR})
++
+ include(DbusActivationMacros)
+ dbus_add_activation_service(org.kde.kdeconnect.service.in)

-- 
kdeconnect packaging