From 04c9ad89643aa658f01bfd363e4fe0410e937839 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 14 May 2021 00:47:34 +0200 Subject: [PATCH] Make it build on hirsute --- debian/control | 2 -- debian/nymea-tests.install.in | 2 +- debian/rules | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 92c64009..0581cb77 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Homepage: https://nymea.io Vcs-Git: https://github.com/nymea/nymea.git Build-Depends: debhelper (>= 9.0.0), dbus-test-runner, - dh-systemd, dpkg-dev (>= 1.16.1~), libnymea-mqtt-dev (>= 0.1.2), libnymea-networkmanager-dev (>= 0.4.0), @@ -22,7 +21,6 @@ Build-Depends: debhelper (>= 9.0.0), rsync, qml-module-qtquick2, qtchooser, - qt5-default, qt5-qmake:native, qtbase5-dev, qttools5-dev-tools, diff --git a/debian/nymea-tests.install.in b/debian/nymea-tests.install.in index 036861aa..7ac11677 100644 --- a/debian/nymea-tests.install.in +++ b/debian/nymea-tests.install.in @@ -1,3 +1,3 @@ -usr/tests/* usr/lib/@DEB_HOST_MULTIARCH@/nymea/tests +usr/tests/* usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginmock.so usr/lib/@DEB_HOST_MULTIARCH@/libnymea-testlib.so* diff --git a/debian/rules b/debian/rules index 4a1bf835..5cca24c6 100755 --- a/debian/rules +++ b/debian/rules @@ -42,9 +42,9 @@ override_dh_auto_build: override_dh_install: $(PREPROCESS_FILES:.in=) # libnymea-core isn't public api... delete dev lib and just keep runtime libs. rm $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libnymea-core.so + # Make sure the docs directory exists, even if we didn't build them + mkdir -p $(CURDIR)/doc/html dh_install --fail-missing - # installing the documentation as there is no extra install target - cp -a $(CURDIR)/doc/html $(CURDIR)/debian/nymea-doc/usr/share/doc/nymea/ || true override_dh_auto_test: dh_auto_test -- -k TESTARGS="-m 120 -p -o -p -,txt -p -o -p test-results.xml,xunitxml" TESTRUNNER="dbus-test-runner --bus-type=both --task"