Update packaging and add pkg config file

debian/changelog

@@ -1,3 +1,11 @@
+nymea-zigbee (0.0.2) bionic; urgency=medium
+
+  * First working base version of zigbee gateway
+  * Abstract template preparaion for multiple hardware support
+  * Rudimentary version of zigbee cluster functionality
+
+ -- Simon Stürz <simon.stuerz@nymea.io>  Fri, 17 May 2019 11:53:31 +0200
+
 nymea-zigbee (0.0.1) bionic; urgency=medium
 
   * Initial release.

debian/control

@@ -14,19 +14,6 @@ Build-Depends: debhelper (>= 9.0.0),
                libqt5serialport5-dev,
                libreadline-dev
 
-Package: zigbee-cli
-Architecture: any
-Section: net
-Multi-Arch: same
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libnymea-zigbee1 (= ${binary:Version}),
-         libncurses5
-Description: Zigbee bridge controller Qt5 - tool
- Command line tool written in Qt for interacting with the NXP Zigbee controller.
- .
- This package will install the zigbee-cli tool.
-
 Package: libnymea-zigbee1
 Section: libs
 Architecture: any

debian/libnymea-zigbee1-dev.install

@@ -1,2 +0,0 @@
-usr/lib/libnymea-zigbee1.so
-usr/include/nymea-zigbee/* usr/include/nymea-zigbee/

debian/libnymea-zigbee1-dev.install.in

@@ -0,0 +1,3 @@
+usr/lib/@DEB_HOST_MULTIARCH@/libnymea-zigbee1.so
+usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/nymea-zigbee.pc
+usr/include/nymea-zigbee/* usr/include/nymea-zigbee/

debian/libnymea-zigbee1.install

@@ -1,3 +0,0 @@
-usr/lib/libnymea-zigbee1.so.1
-usr/lib/libnymea-zigbee1.so.1.0
-usr/lib/libnymea-zigbee1.so.1.0.0

debian/libnymea-zigbee1.install.in

@@ -0,0 +1,3 @@
+usr/lib/@DEB_HOST_MULTIARCH@/libnymea-zigbee1.so.1
+usr/lib/@DEB_HOST_MULTIARCH@/libnymea-zigbee1.so.1.0
+usr/lib/@DEB_HOST_MULTIARCH@/libnymea-zigbee1.so.1.0.0

debian/rules

@@ -2,23 +2,25 @@
 # -*- makefile -*-
 
 export DH_VERBOSE=1
-export QT_QPA_PLATFORM=minimal
 
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-	DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-else
-	DEB_PARALLEL_JOBS += $(shell getconf _NPROCESSORS_ONLN)
-endif
 
-DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-%:
+PREPROCESS_FILES := $(wildcard debian/*.in)
-	dh $@ --buildsystem=qmake --parallel
+
+$(PREPROCESS_FILES:.in=): %: %.in
+	sed 's,/@DEB_HOST_MULTIARCH@,$(DEB_HOST_MULTIARCH:%=/%),g' $< > $@
+
+override_dh_install: $(PREPROCESS_FILES:.in=)
+	dh_install
 
 override_dh_strip:
 	dh_strip --dbg-package=libnymea-zigbee1-dbg
 
-override_dh_auto_build:
+override_dh_auto_clean:
-	make -j$(DEB_PARALLEL_JOBS)
+	dh_auto_clean
+	rm -rf $(PREPROCESS_FILES:.in=)
 
+%:
+	dh $@ --buildsystem=qmake --parallel

debian/zigbee-cli.install

@@ -1 +0,0 @@
-usr/bin/zigbee-cli

libnymea-zigbee/interface/zigbeeinterface.cpp

@@ -14,7 +14,7 @@ ZigbeeInterface::ZigbeeInterface(QObject *parent) :
 
 ZigbeeInterface::~ZigbeeInterface()
 {
-    qCCritical(dcZigbeeInterface()) << "Destroy interface";
+    qCDebug(dcZigbeeInterface()) << "Destroy interface";
     disable();
 }
 

libnymea-zigbee/libnymea-zigbee.pro

@@ -3,8 +3,6 @@ include(../config.pri)
 TARGET = nymea-zigbee1
 TEMPLATE = lib
 
-target.path = /usr/lib
-
 SOURCES += \
     interface/zigbeeinterface.cpp \
     interface/zigbeeinterfacemessage.cpp \
@@ -41,12 +39,26 @@ HEADERS += \
     zigbeenode.h \
     zigbeeaddress.h \
 
-INSTALLS += target
-
 # install header file with relative subdirectory
-for(header, HEADERS) {
+for (header, HEADERS) {
-    path = /usr/include/nymea-zigbee/$${dirname(header)}
+    path = $$[QT_INSTALL_PREFIX]/include/nymea-zigbee/$${dirname(header)}
     eval(headers_$${path}.files += $${header})
     eval(headers_$${path}.path = $${path})
     eval(INSTALLS *= headers_$${path})
 }
+
+# define install target
+target.path = $$[QT_INSTALL_LIBS]
+INSTALLS += target
+
+# Create pkgconfig file
+CONFIG += create_pc create_prl no_install_prl
+QMAKE_PKGCONFIG_NAME = libnymea-zigbee
+QMAKE_PKGCONFIG_DESCRIPTION = nymea-zigbee development library
+QMAKE_PKGCONFIG_PREFIX = $$[QT_INSTALL_PREFIX]
+QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_PREFIX]/include/nymea-zigbee/
+QMAKE_PKGCONFIG_LIBDIR = $$target.path
+QMAKE_PKGCONFIG_VERSION = 1.0.0
+QMAKE_PKGCONFIG_FILE = nymea-zigbee
+QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+