diff --git a/packaging/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml index abd50216..6141ef4d 100644 --- a/packaging/android/AndroidManifest.xml +++ b/packaging/android/AndroidManifest.xml @@ -89,7 +89,6 @@ - diff --git a/packaging/ubuntu/debian-qt6/compat b/packaging/ubuntu/debian-qt6/compat index ec635144..b1bd38b6 100644 --- a/packaging/ubuntu/debian-qt6/compat +++ b/packaging/ubuntu/debian-qt6/compat @@ -1 +1 @@ -9 +13 diff --git a/packaging/ubuntu/debian-qt6/control b/packaging/ubuntu/debian-qt6/control index e897e970..e44c14d6 100644 --- a/packaging/ubuntu/debian-qt6/control +++ b/packaging/ubuntu/debian-qt6/control @@ -9,15 +9,19 @@ Build-Depends: debhelper, dpkg-dev, libavahi-client-dev, libavahi-common-dev, + libxkbcommon-dev, qt6-base-dev, qt6-base-dev-tools, + qt6-base-private-dev, qt6-connectivity-dev, qt6-charts-dev, qt6-svg-dev, qt6-websockets-dev, qt6-webview-dev, qt6-declarative-dev, - libqt6quickcontrols2-6, + qt6-tools-dev, + libqt6quickcontrols2-6 + Package: nymea-app Architecture: any @@ -25,21 +29,8 @@ Section: x11 Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - libqt5network5, - libqt5gui5, - libqt5websockets5, - libqt5bluetooth5, - qml-module-qt-labs-calendar, - qml-module-qt-labs-folderlistmodel, - qml-module-qt-labs-settings, - qml-module-qtcharts, - qml-module-qtgraphicaleffects, - qml-module-qtquick-controls2, - qml-module-qtquick-layouts, - qml-module-qtquick-window2, - qml-module-qtquick2, -Recommends: qml-module-qtwebview, -Suggests: nymea, +Recommends: qml6-module-qtwebview, +Suggests: nymea, network-manager Description: A client app for nymea This package will install nymea:app, the client app diff --git a/packaging/ubuntu/debian-qt6/rules b/packaging/ubuntu/debian-qt6/rules index 71262a39..87e05cff 100755 --- a/packaging/ubuntu/debian-qt6/rules +++ b/packaging/ubuntu/debian-qt6/rules @@ -3,8 +3,9 @@ export DH_VERBOSE=1 -override_dh_missing: - dh_missing --fail-missing +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp %: - dh $@ --buildsystem=qmake --parallel --with systemd + dh $@ --buildsystem=qmake6 --parallel + diff --git a/version.txt b/version.txt index a7a42a18..f73b60e9 100644 --- a/version.txt +++ b/version.txt @@ -1,2 +1,2 @@ 1.11.0 -681 +682