[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=83c882c

The following commit has been merged in the master branch:
commit 83c882cbddef67e92c4a41a079d5c5cc41094f16
Author: Rohan Garg <rohan at kde.org>
Date:   Sat Jun 14 16:50:54 2014 +0200

    Fix build
---
 cli/CMakeLists.txt                        |  2 +-
 interfaces/CMakeLists.txt                 | 16 ++++++++--------
 kio/CMakeLists.txt                        |  4 ++--
 plasmoid/declarativeplugin/CMakeLists.txt |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index 6bc525e..0eb8402 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -2,6 +2,6 @@ include_directories(${CMAKE_SOURCE_DIR})
 
 add_executable(kdeconnect-cli kdeconnect-cli.cpp)
 
-target_link_libraries(kdeconnect-cli kdeconnect ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS})
+target_link_libraries(kdeconnect-cli kdeconnectinterfaces ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS})
 
 install(TARGETS kdeconnect-cli ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index f5faefa..4985376 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@@ -39,18 +39,18 @@ set(libkdeconnect_HEADERS
 set_source_files_properties(
     ${CMAKE_BINARY_DIR}/core/org.kde.kdeconnect.daemon.xml
     ${CMAKE_BINARY_DIR}/core/org.kde.kdeconnect.device.xml
-    ${CMAKE_BINARY_DIR}/core/plugins/battery/org.kde.kdeconnect.device.battery.xml
-    ${CMAKE_BINARY_DIR}/core/plugins/sftp/org.kde.kdeconnect.device.sftp.xml
-    ${CMAKE_BINARY_DIR}/core/plugins/notifications/org.kde.kdeconnect.device.notifications.xml
-    ${CMAKE_BINARY_DIR}/core/plugins/notifications/org.kde.kdeconnect.device.notifications.notification.xml
+    ${CMAKE_BINARY_DIR}/plugins/battery/org.kde.kdeconnect.device.battery.xml
+    ${CMAKE_BINARY_DIR}/plugins/sftp/org.kde.kdeconnect.device.sftp.xml
+    ${CMAKE_BINARY_DIR}/plugins/notifications/org.kde.kdeconnect.device.notifications.xml
+    ${CMAKE_BINARY_DIR}/plugins/notifications/org.kde.kdeconnect.device.notifications.notification.xml
     PROPERTIES NO_NAMESPACE true
 )
 qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/org.kde.kdeconnect.daemon.xml daemoninterface)
 qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/org.kde.kdeconnect.device.xml deviceinterface)
-qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/plugins/battery/org.kde.kdeconnect.device.battery.xml devicebatteryinterface )
-qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/plugins/sftp/org.kde.kdeconnect.device.sftp.xml devicesftpinterface )
-qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/plugins/notifications/org.kde.kdeconnect.device.notifications.xml devicenotificationsinterface )
-qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/plugins/notifications/org.kde.kdeconnect.device.notifications.notification.xml notificationinterface  )
+qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/plugins/battery/org.kde.kdeconnect.device.battery.xml devicebatteryinterface )
+qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/plugins/sftp/org.kde.kdeconnect.device.sftp.xml devicesftpinterface )
+qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/plugins/notifications/org.kde.kdeconnect.device.notifications.xml devicenotificationsinterface )
+qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/plugins/notifications/org.kde.kdeconnect.device.notifications.notification.xml notificationinterface  )
 
 kde4_add_library(kdeconnectinterfaces SHARED ${libkdeconnect_SRC})
 set_target_properties(kdeconnectinterfaces PROPERTIES
diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index 8a0754d..f0e44fb 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -6,7 +6,7 @@ set(kio_kdeconnect_PART_SRCS
 
 kde4_add_plugin(kio_kdeconnect ${kio_kdeconnect_PART_SRCS})
 
-add_dependencies(kio_kdeconnect libkdeconnect)
+add_dependencies(kio_kdeconnect libkdeconnectinterfaces)
 
 target_link_libraries(kio_kdeconnect
     ${KDE4_KDECORE_LIBS}
@@ -14,7 +14,7 @@ target_link_libraries(kio_kdeconnect
     ${KDE4_KDEUI_LIBRARY}
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
-    kdeconnect
+    kdeconnectinterfaces
 )
 
 ########### install files ###############
diff --git a/plasmoid/declarativeplugin/CMakeLists.txt b/plasmoid/declarativeplugin/CMakeLists.txt
index 4919d47..c2a0310 100644
--- a/plasmoid/declarativeplugin/CMakeLists.txt
+++ b/plasmoid/declarativeplugin/CMakeLists.txt
@@ -15,14 +15,14 @@ set(kdeconnectdeclarativeplugin_MOC
 qt4_wrap_cpp(kdeconnectdeclarativeplugin_SRC ${kdeconnectdeclarativeplugin_MOC})    
 
 kde4_add_library(kdeconnectdeclarativeplugin SHARED ${kdeconnectdeclarativeplugin_SRC})
-add_dependencies(kdeconnectdeclarativeplugin libkdeconnect)
+add_dependencies(kdeconnectdeclarativeplugin libkdeconnectinterfaces)
 target_link_libraries(kdeconnectdeclarativeplugin
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KDECORE_LIBS}
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
     ${QT_QTDECLARATIVE_LIBRARY}
-    kdeconnect
+    kdeconnectinterfaces
 )
 install(TARGETS kdeconnectdeclarativeplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/kdeconnect)
 install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/kdeconnect)

-- 
kdeconnect packaging