From 9214da28134d7962144debd72359b5761c93dc9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <stuerz.simon@gmail.com>
Date: Sun, 20 Dec 2015 17:10:24 +0100
Subject: [PATCH] fix coap includes

---
 debian/control       |  7 ++++---
 libguh/coap/coap.pri | 24 ------------------------
 libguh/libguh.pro    | 21 +++++++++++++++++----
 3 files changed, 21 insertions(+), 31 deletions(-)
 delete mode 100644 libguh/coap/coap.pri

diff --git a/debian/control b/debian/control
index 8665e905..f5bb7948 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Standards-Version: 3.9.3
 Package: guh
 Architecture: any
 Section: misc
-Depends: guh (= ${binary:Version}),
+Depends: guhd (= ${binary:Version}),
   guh-plugins (= ${binary:Version}),
 Description: An open source IoT server - meta package
   guh is an open source IoT (Internet of Things) server, 
@@ -46,7 +46,8 @@ Package: guh-dbg
 Priority: extra
 Architecture: any
 Section: debug
-Depends: guh (= ${binary:Version}), ${misc:Depends}
+Depends: guh (= ${binary:Version}), 
+  ${misc:Depends}
 Description: An open source IoT server - debug symbols
   guh is an open source IoT (Internet of Things) server,
   which allows to control a lot of different devices from many different
@@ -70,7 +71,7 @@ Architecture: any
 Depends: guh (= ${binary:Version}),
   ${shlibs:Depends},
   ${misc:Depends}
-Description: Tests for the guh package
+Description: Tests and mock plugin for the guh package
   guh is an open source IoT (Internet of Things) server,
   which allows to control a lot of different devices from many different
   manufacturers. With the powerful rule engine you are able to connect any
diff --git a/libguh/coap/coap.pri b/libguh/coap/coap.pri
deleted file mode 100644
index 1372e905..00000000
--- a/libguh/coap/coap.pri
+++ /dev/null
@@ -1,24 +0,0 @@
-QT += network
-
-QMAKE_CXXFLAGS += -Werror
-CONFIG += c++11
-
-SOURCES += \
-    $$PWD/coap.cpp \
-    $$PWD/coappdu.cpp \
-    $$PWD/coapoption.cpp \
-    $$PWD/coaprequest.cpp \
-    $$PWD/coapreply.cpp \
-    $$PWD/coappdublock.cpp \
-    $$PWD/corelinkparser.cpp \
-    $$PWD/corelink.cpp
-
-HEADERS += \
-    $$PWD/coap.h \
-    $$PWD/coappdu.h \
-    $$PWD/coapoption.h \
-    $$PWD/coaprequest.h \
-    $$PWD/coapreply.h \
-    $$PWD/coappdublock.h \
-    $$PWD/corelinkparser.h \
-    $$PWD/corelink.h
diff --git a/libguh/libguh.pro b/libguh/libguh.pro
index 3643c6b8..e0e7b23d 100644
--- a/libguh/libguh.pro
+++ b/libguh/libguh.pro
@@ -16,8 +16,6 @@ contains(DEFINES, BLUETOOTH_LE) {
                bluetooth/bluetoothlowenergydevice.h \
 }
 
-include(coap/coap.pri)
-
 SOURCES += devicemanager.cpp \
            loggingcategories.cpp \
            guhsettings.cpp \
@@ -37,6 +35,14 @@ SOURCES += devicemanager.cpp \
            network/upnpdiscovery/upnpdiscoveryrequest.cpp \
            network/networkmanager.cpp \
            network/oauth2.cpp \
+           coap/coap.cpp \
+           coap/coappdu.cpp \
+           coap/coapoption.cpp \
+           coap/coaprequest.cpp \
+           coap/coapreply.cpp \
+           coap/coappdublock.cpp \
+           coap/corelinkparser.cpp \
+           coap/corelink.cpp \
            types/action.cpp \
            types/actiontype.cpp \
            types/state.cpp \
@@ -72,6 +78,14 @@ HEADERS += devicemanager.h \
            network/upnpdiscovery/upnpdiscoveryrequest.h \
            network/networkmanager.h \
            network/oauth2.h \
+           coap/coap.h \
+           coap/coappdu.h \
+           coap/coapoption.h \
+           coap/coaprequest.h \
+           coap/coapreply.h \
+           coap/coappdublock.h \
+           coap/corelinkparser.h \
+           coap/corelink.h \
            types/action.h \
            types/actiontype.h \
            types/state.h \
@@ -87,8 +101,7 @@ HEADERS += devicemanager.h \
            types/ruleactionparam.h \
            types/statedescriptor.h \
 
-
-# install files for libguh-dev
+# install plugininfo python script for libguh-dev
 generateplugininfo.files = $$top_srcdir/plugins/guh-generateplugininfo
 generateplugininfo.path = /usr/bin