From 467d2cc715e6451e44e8a3dd81de4e683e1bf13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 17 Nov 2020 10:10:11 +0100 Subject: [PATCH] Make debian package multi-arch --- debian/control | 3 +++ libnymea-zigbee/zigbeeuartadaptermonitor.cpp | 5 +++++ libnymea-zigbee/zigbeeuartadaptermonitor.h | 1 + 3 files changed, 9 insertions(+) diff --git a/debian/control b/debian/control index 24704d0..0704efc 100644 --- a/debian/control +++ b/debian/control @@ -12,12 +12,14 @@ Build-Depends: debhelper (>= 9.0.0), qt5-qmake, qtbase5-dev, qtbase5-dev-tools, + libqt5sql5-sqlite, libqt5serialport5-dev, libudev-dev Package: libnymea-zigbee1 Section: libs Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, libqt5network5, @@ -31,6 +33,7 @@ Description: Qt 5 based library for ZigBee Package: libnymea-zigbee-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libnymea-zigbee1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, diff --git a/libnymea-zigbee/zigbeeuartadaptermonitor.cpp b/libnymea-zigbee/zigbeeuartadaptermonitor.cpp index d34acde..2fcadff 100644 --- a/libnymea-zigbee/zigbeeuartadaptermonitor.cpp +++ b/libnymea-zigbee/zigbeeuartadaptermonitor.cpp @@ -179,6 +179,11 @@ QList ZigbeeUartAdapterMonitor::availableAdapters() const return m_availableAdapters.values(); } +bool ZigbeeUartAdapterMonitor::hasAdapter(const QString &serialPort) const +{ + return m_availableAdapters.contains(serialPort); +} + bool ZigbeeUartAdapterMonitor::isValid() const { return m_isValid; diff --git a/libnymea-zigbee/zigbeeuartadaptermonitor.h b/libnymea-zigbee/zigbeeuartadaptermonitor.h index 2404581..2958404 100644 --- a/libnymea-zigbee/zigbeeuartadaptermonitor.h +++ b/libnymea-zigbee/zigbeeuartadaptermonitor.h @@ -40,6 +40,7 @@ public: explicit ZigbeeUartAdapterMonitor(QObject *parent = nullptr); QList availableAdapters() const; + bool hasAdapter(const QString &serialPort) const; bool isValid() const;