From 1f4df62b7b161653997cc2f49e7041d9b6a4b7b0 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 12 Jan 2021 12:02:06 +0100 Subject: [PATCH 1/2] Restructure nymea-sdk meta package nymea-dev-tools depending on libnymea1-dev now, given it requires the plugin.pri for translations support at least. Instead, make the dependency to QtCreator related stuff optional (recommended). --- debian/control | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 4529c696..d54b4fa9 100644 --- a/debian/control +++ b/debian/control @@ -184,7 +184,7 @@ Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - libnymea1 (= ${binary:Version}), + libnymea1-dev (= ${binary:Version}), qttools5-dev-tools, rsync, Description: Tools for developing nymea plugins. @@ -195,10 +195,9 @@ Package: nymea-sdk Section: devel Architecture: all Multi-Arch: allowed -Depends: crossbuilder, - libnymea1-dev, - nymea-dev-tools, - nymea-qtcreator-wizards, +Depends: nymea-dev-tools +Recommends: nymea-qtcreator-wizards, + crossbuilder, Description: The nymea SDK. . Meta-Package for everything required to develop on nymea. From b47a0f9c1574938d5ce350a9db9ffab478aa6ddb Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 17 Jan 2021 22:52:05 +0100 Subject: [PATCH 2/2] Move plugin.pri to dev-tools package It's not required to link to libnymea, but it is required when running the plugininfo-compiler. --- debian/control | 2 +- debian/libnymea1-dev.install.in | 12 ++++++++++-- debian/nymea-dev-tools.install.in | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index d54b4fa9..64f92d6e 100644 --- a/debian/control +++ b/debian/control @@ -184,7 +184,7 @@ Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - libnymea1-dev (= ${binary:Version}), + libnymea1 (= ${binary:Version}), qttools5-dev-tools, rsync, Description: Tools for developing nymea plugins. diff --git a/debian/libnymea1-dev.install.in b/debian/libnymea1-dev.install.in index e890f8b5..dfbc1840 100644 --- a/debian/libnymea1-dev.install.in +++ b/debian/libnymea1-dev.install.in @@ -1,4 +1,12 @@ usr/lib/@DEB_HOST_MULTIARCH@/libnymea.so -usr/include/nymea/* usr/include/nymea -libnymea/integrations/plugin.pri usr/include/nymea/ +usr/include/nymea/*.h +usr/include/nymea/coap/* +usr/include/nymea/experiences/* +usr/include/nymea/hardware/* +usr/include/nymea/integrations/* +usr/include/nymea/jsonrpc/* +usr/include/nymea/network/* +usr/include/nymea/platform/* +usr/include/nymea/time/* +usr/include/nymea/types/* usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/nymea.pc diff --git a/debian/nymea-dev-tools.install.in b/debian/nymea-dev-tools.install.in index 8e838548..abe1c57b 100644 --- a/debian/nymea-dev-tools.install.in +++ b/debian/nymea-dev-tools.install.in @@ -1 +1,2 @@ usr/bin/nymea-plugininfocompiler +usr/include/nymea/plugin.pri