[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=df12667

The following commit has been merged in the master branch:
commit df12667f10a8722ecbb416f27a019ca2d51e0884
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Jun 25 18:43:54 2013 +0200

    Fixed cmake build
---
 daemon/CMakeLists.txt         | 4 ++--
 kcm/CMakeLists.txt            | 4 ++--
 kcm/kcm.cpp                   | 2 +-
 kcm/kcm.h                     | 2 +-
 kcm/{wizzard.ui => wizard.ui} | 0
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index e3116e1..70a501b 100644
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -15,6 +15,8 @@ set(kded_androidshine_SRCS
     networkpackage.cpp
     daemon.cpp
     device.cpp
+
+    ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.xml
 )
 
 kde4_add_plugin(kded_androidshine ${kded_androidshine_SRCS})
@@ -34,8 +36,6 @@ qt4_generate_dbus_interface(
     OPTIONS -a
 )
 
-add_dependencies(kded_androidshine ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.xml)
-
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
 install(TARGETS kded_androidshine DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES androidshine.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt
index 87f13b0..ceaa396 100644
--- a/kcm/CMakeLists.txt
+++ b/kcm/CMakeLists.txt
@@ -5,11 +5,11 @@ set(kcm_SRCS
 
 qt4_add_dbus_interface(
    kcm_SRCS
-   ${DBUS_INTERFACES_INSTALL_DIR}/org.kde.kdeconnect.xml
+   ${CMAKE_BINARY_DIR}/daemon/org.kde.kdeconnect.xml
    daemoninterface
 )
 
-kde4_add_ui_files(kcm_SRCS kcm.ui wizzard.ui)
+kde4_add_ui_files(kcm_SRCS kcm.ui wizard.ui)
 
 kde4_add_plugin(kdeconnect-kcm ${kcm_SRCS})
 
diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
index e341276..01f8ccf 100644
--- a/kcm/kcm.cpp
+++ b/kcm/kcm.cpp
@@ -41,7 +41,7 @@ KdeConnectKcm::KdeConnectKcm(QWidget *parent, const QVariantList&)
     : KCModule(KdeConnectKcmFactory::componentData(), parent)
     , dbusInterface("org.kde.kded", "/modules/androidshine", QDBusConnection::sessionBus(), this)
 {
-    
+
     m_ui = new Ui::KdeConnectKcmUi();
     m_ui->setupUi(this);
 
diff --git a/kcm/kcm.h b/kcm/kcm.h
index 0f041bf..c99b008 100644
--- a/kcm/kcm.h
+++ b/kcm/kcm.h
@@ -56,7 +56,7 @@ private Q_SLOTS:
     void deviceRemoved(QString id);
 
 private:
-    LocalDaemonInterface dbusInterface;
+    OrgKdeKdeconnectInterface dbusInterface;
     Ui::KdeConnectKcmUi* m_ui;
     QStandardItemModel* m_model;
 
diff --git a/kcm/wizzard.ui b/kcm/wizard.ui
similarity index 100%
rename from kcm/wizzard.ui
rename to kcm/wizard.ui

-- 
kdeconnect packaging