fixed guhd.conf destination

add generateplugininfo to libguh-dev

debian/guhd.install

@@ -1,3 +1,3 @@
 usr/bin/guhd
 data/init/* /etc/init.d
-data/config/guhd.conf /etc/guh/guhd.conf
+data/config/guhd.conf /etc/guh/

debian/libguh1-dev.install

@@ -1,3 +1,4 @@
 usr/lib/libguh.so
 usr/include/guh/* usr/include/guh
+usr/bin/generateplugininfo usr/bin
 

guh.pri

@@ -26,8 +26,8 @@ enable433gpio {
     DEFINES += GPIO433
 }
 
-# check websocket support
+# check websocket support (sonce Qt 5.3)
-equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 3) {
+equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 2) {
     DEFINES += WEBSOCKET
 }
 

libguh/libguh.pro

@@ -5,6 +5,9 @@ TEMPLATE = lib
 
 QT += network
 
+target.path = /usr/lib
+INSTALLS += target
+
 SOURCES += plugin/device.cpp \
            plugin/deviceclass.cpp \
            plugin/deviceplugin.cpp \
@@ -72,9 +75,11 @@ HEADERS += plugin/device.h \
            guhsettings.h \
 
 
-target.path = /usr/lib
+# install files for libguh-dev
-
 headers.files = $$HEADERS
 headers.path = /usr/include/guh
 
-INSTALLS += target headers
+generateplugininfo.files = $$top_srcdir/plugins/generateplugininfo
+generateplugininfo.path = /usr/bin
+
+INSTALLS += headers generateplugininfo

plugins/generateplugininfo

@@ -1,9 +1,31 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+
+# -*- coding: UTF-8 -*-
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#                                                                         #
+#  Copyright (C) 2015 Simon Stuerz <simon.stuerz@guh.guru>                #
+#  Copyright (C) 2014 Michael Zanetti <michael_zanetti@gmx.net>           #
+#                                                                         #
+#  This file is part of guh-cli.                                          #
+#                                                                         #
+#  guh-cli is free software: you can redistribute it and/or modify        #
+#  it under the terms of the GNU General Public License as published by   #
+#  the Free Software Foundation, version 2 of the License.                #
+#                                                                         #
+#  guh-cli is distributed in the hope that it will be useful,             #
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of         #
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the           #
+#  GNU General Public License for more details.                           #
+#                                                                         #
+#  You should have received a copy of the GNU General Public License      #
+#  along with guh. If not, see <http://www.gnu.org/licenses/>.            #
+#                                                                         #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
 import json
 import sys
 
-
 inputFile = open(sys.argv[1], "r")
 outputfile = open(sys.argv[2], "w")
 outputfile2 = open("extern-" + sys.argv[2], "w")

plugins/plugins.pri

@@ -9,8 +9,8 @@ INCLUDEPATH += ../../../libguh
 LIBS += -L../../../libguh -lguh
 
 infofile.output = plugininfo.h
-infofile.commands = $$top_srcdir/plugins/generateplugininfo.py ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
+infofile.commands = $$top_srcdir/plugins/generateplugininfo ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
-infofile.depends = $$top_srcdir/plugins/generateplugininfo.py
+infofile.depends = $$top_srcdir/plugins/generateplugininfo
 infofile.CONFIG = no_link
 JSONFILES = deviceplugin"$$TARGET".json
 infofile.input = JSONFILES