[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:26:38 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=392e010
The following commit has been merged in the master branch:
commit 392e010a30dac8d8190168ab7fae052cc23a4be7
Author: Albert Vaca <albertvaka at gmail.com>
Date: Wed Jun 19 13:29:24 2013 +0200
Housekeeping
---
CMakeLists.txt | 5 +++--
{src => daemon}/CMakeLists.txt | 23 +++++++++++++---------
{src => daemon}/androidshine.desktop | 0
{src => daemon}/androidshine.notifyrc | 0
{src => daemon/announcers}/announcer.cpp | 0
{src => daemon/announcers}/announcer.h | 2 +-
{src => daemon/announcers}/avahiannouncer.cpp | 2 +-
{src => daemon/announcers}/avahiannouncer.h | 0
{src => daemon/announcers}/fakeannouncer.cpp | 2 +-
{src => daemon/announcers}/fakeannouncer.h | 0
{src => daemon}/daemon.cpp | 8 ++++----
{src => daemon}/daemon.h | 6 +++---
{src => daemon}/device.h | 0
{src => daemon/devicelinks}/devicelink.cpp | 0
{src => daemon/devicelinks}/devicelink.h | 0
{src => daemon/devicelinks}/echodevicelink.cpp | 0
{src => daemon/devicelinks}/echodevicelink.h | 0
{src => daemon/devicelinks}/udpdevicelink.cpp | 0
{src => daemon/devicelinks}/udpdevicelink.h | 0
{src => daemon}/networkpackage.cpp | 0
{src => daemon}/networkpackage.h | 0
.../notificationpackagereceiver.cpp | 0
.../notificationpackagereceiver.h | 0
.../packagereceivers}/packagereceiver.cpp | 0
{src => daemon/packagereceivers}/packagereceiver.h | 0
.../pausemusicpackagereceiver.cpp | 0
.../packagereceivers}/pausemusicpackagereceiver.h | 0
src/avahidevicelocator.cpp | 0
test/CMakeLists.txt | 1 +
29 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c90365..acef29b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,11 @@
project(androidshine)
+cmake_minimum_required(VERSION 2.6)
find_package(KDE4 REQUIRED)
include(KDE4Defaults)
include_directories(${KDE4_INCLUDES})
-add_subdirectory(src)
-
+add_subdirectory(daemon)
+add_subdirectory(kcm)
add_subdirectory(test)
diff --git a/src/CMakeLists.txt b/daemon/CMakeLists.txt
similarity index 58%
rename from src/CMakeLists.txt
rename to daemon/CMakeLists.txt
index d55d8cd..41d21ab 100644
--- a/src/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -1,15 +1,20 @@
set(kded_androidshine_SRCS
- fakeannouncer.cpp
- echodevicelink.cpp
- udpdevicelink.cpp
- avahiannouncer.cpp
- pausemusicpackagereceiver.cpp
- notificationpackagereceiver.cpp
+
+ announcers/announcer.cpp
+ announcers/fakeannouncer.cpp
+ announcers/avahiannouncer.cpp
+
+ devicelinks/echodevicelink.cpp
+ devicelinks/udpdevicelink.cpp
+ devicelinks/devicelink.cpp
+
+ packagereceivers/packagereceiver.cpp
+ packagereceivers/pausemusicpackagereceiver.cpp
+ packagereceivers/notificationpackagereceiver.cpp
+
networkpackage.cpp
daemon.cpp
- devicelink.cpp
- announcer.cpp
- packagereceiver.cpp
+
)
kde4_add_plugin(kded_androidshine ${kded_androidshine_SRCS})
diff --git a/src/androidshine.desktop b/daemon/androidshine.desktop
similarity index 100%
rename from src/androidshine.desktop
rename to daemon/androidshine.desktop
diff --git a/src/androidshine.notifyrc b/daemon/androidshine.notifyrc
similarity index 100%
rename from src/androidshine.notifyrc
rename to daemon/androidshine.notifyrc
diff --git a/src/announcer.cpp b/daemon/announcers/announcer.cpp
similarity index 100%
rename from src/announcer.cpp
rename to daemon/announcers/announcer.cpp
diff --git a/src/announcer.h b/daemon/announcers/announcer.h
similarity index 97%
rename from src/announcer.h
rename to daemon/announcers/announcer.h
index c6c3d3c..49c04f1 100644
--- a/src/announcer.h
+++ b/daemon/announcers/announcer.h
@@ -24,7 +24,7 @@
#include <qvector.h>
#include <QObject>
-#include "devicelink.h"
+#include "devicelinks/devicelink.h"
#include "device.h"
class Announcer
diff --git a/src/avahiannouncer.cpp b/daemon/announcers/avahiannouncer.cpp
similarity index 98%
rename from src/avahiannouncer.cpp
rename to daemon/announcers/avahiannouncer.cpp
index c4bdb05..756a050 100644
--- a/src/avahiannouncer.cpp
+++ b/daemon/announcers/avahiannouncer.cpp
@@ -20,7 +20,7 @@
#include "avahiannouncer.h"
-#include "udpdevicelink.h"
+#include "devicelinks/udpdevicelink.h"
AvahiAnnouncer::AvahiAnnouncer()
{
diff --git a/src/avahiannouncer.h b/daemon/announcers/avahiannouncer.h
similarity index 100%
rename from src/avahiannouncer.h
rename to daemon/announcers/avahiannouncer.h
diff --git a/src/fakeannouncer.cpp b/daemon/announcers/fakeannouncer.cpp
similarity index 96%
rename from src/fakeannouncer.cpp
rename to daemon/announcers/fakeannouncer.cpp
index 3656948..dca0f51 100644
--- a/src/fakeannouncer.cpp
+++ b/daemon/announcers/fakeannouncer.cpp
@@ -19,7 +19,7 @@
*/
#include "fakeannouncer.h"
-#include "echodevicelink.h"
+#include "devicelinks/echodevicelink.h"
FakeAnnouncer::FakeAnnouncer()
{
diff --git a/src/fakeannouncer.h b/daemon/announcers/fakeannouncer.h
similarity index 100%
rename from src/fakeannouncer.h
rename to daemon/announcers/fakeannouncer.h
diff --git a/src/daemon.cpp b/daemon/daemon.cpp
similarity index 94%
rename from src/daemon.cpp
rename to daemon/daemon.cpp
index b0440ec..bac59b5 100644
--- a/src/daemon.cpp
+++ b/daemon/daemon.cpp
@@ -20,10 +20,10 @@
#include "daemon.h"
#include "networkpackage.h"
-#include "notificationpackagereceiver.h"
-#include "pausemusicpackagereceiver.h"
-#include "avahiannouncer.h"
-#include "fakeannouncer.h"
+#include "packagereceivers/notificationpackagereceiver.h"
+#include "packagereceivers/pausemusicpackagereceiver.h"
+#include "announcers/avahiannouncer.h"
+#include "announcers/fakeannouncer.h"
#include <QtNetwork/QUdpSocket>
#include <QFile>
diff --git a/src/daemon.h b/daemon/daemon.h
similarity index 95%
rename from src/daemon.h
rename to daemon/daemon.h
index b69b5d3..723c182 100644
--- a/src/daemon.h
+++ b/daemon/daemon.h
@@ -37,9 +37,9 @@
#include <QSet>
#include "device.h"
-#include "packagereceiver.h"
-#include "devicelink.h"
-#include "announcer.h"
+#include "packagereceivers/packagereceiver.h"
+#include "devicelinks/devicelink.h"
+#include "announcers/announcer.h"
class QUdpSocket;
diff --git a/src/device.h b/daemon/device.h
similarity index 100%
rename from src/device.h
rename to daemon/device.h
diff --git a/src/devicelink.cpp b/daemon/devicelinks/devicelink.cpp
similarity index 100%
rename from src/devicelink.cpp
rename to daemon/devicelinks/devicelink.cpp
diff --git a/src/devicelink.h b/daemon/devicelinks/devicelink.h
similarity index 100%
rename from src/devicelink.h
rename to daemon/devicelinks/devicelink.h
diff --git a/src/echodevicelink.cpp b/daemon/devicelinks/echodevicelink.cpp
similarity index 100%
rename from src/echodevicelink.cpp
rename to daemon/devicelinks/echodevicelink.cpp
diff --git a/src/echodevicelink.h b/daemon/devicelinks/echodevicelink.h
similarity index 100%
rename from src/echodevicelink.h
rename to daemon/devicelinks/echodevicelink.h
diff --git a/src/udpdevicelink.cpp b/daemon/devicelinks/udpdevicelink.cpp
similarity index 100%
rename from src/udpdevicelink.cpp
rename to daemon/devicelinks/udpdevicelink.cpp
diff --git a/src/udpdevicelink.h b/daemon/devicelinks/udpdevicelink.h
similarity index 100%
rename from src/udpdevicelink.h
rename to daemon/devicelinks/udpdevicelink.h
diff --git a/src/networkpackage.cpp b/daemon/networkpackage.cpp
similarity index 100%
rename from src/networkpackage.cpp
rename to daemon/networkpackage.cpp
diff --git a/src/networkpackage.h b/daemon/networkpackage.h
similarity index 100%
rename from src/networkpackage.h
rename to daemon/networkpackage.h
diff --git a/src/notificationpackagereceiver.cpp b/daemon/packagereceivers/notificationpackagereceiver.cpp
similarity index 100%
rename from src/notificationpackagereceiver.cpp
rename to daemon/packagereceivers/notificationpackagereceiver.cpp
diff --git a/src/notificationpackagereceiver.h b/daemon/packagereceivers/notificationpackagereceiver.h
similarity index 100%
rename from src/notificationpackagereceiver.h
rename to daemon/packagereceivers/notificationpackagereceiver.h
diff --git a/src/packagereceiver.cpp b/daemon/packagereceivers/packagereceiver.cpp
similarity index 100%
rename from src/packagereceiver.cpp
rename to daemon/packagereceivers/packagereceiver.cpp
diff --git a/src/packagereceiver.h b/daemon/packagereceivers/packagereceiver.h
similarity index 100%
rename from src/packagereceiver.h
rename to daemon/packagereceivers/packagereceiver.h
diff --git a/src/pausemusicpackagereceiver.cpp b/daemon/packagereceivers/pausemusicpackagereceiver.cpp
similarity index 100%
rename from src/pausemusicpackagereceiver.cpp
rename to daemon/packagereceivers/pausemusicpackagereceiver.cpp
diff --git a/src/pausemusicpackagereceiver.h b/daemon/packagereceivers/pausemusicpackagereceiver.h
similarity index 100%
rename from src/pausemusicpackagereceiver.h
rename to daemon/packagereceivers/pausemusicpackagereceiver.h
diff --git a/src/avahidevicelocator.cpp b/src/avahidevicelocator.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2cf7e9d..a44a4e3 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -8,6 +8,7 @@ target_link_libraries(kded_androidshine_tests
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
kdnssd
+ ${QT_QTTEST_LIBRARY}
${QT_QTNETWORK_LIBRARY}
)
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list