diff -Nru qtmir-0.6.1/debian/changelog qtmir-0.6.1/debian/changelog --- qtmir-0.6.1/debian/changelog 2020-11-30 07:54:20.000000000 +0000 +++ qtmir-0.6.1/debian/changelog 2020-12-16 15:32:50.000000000 +0000 @@ -1,14 +1,17 @@ -qtmir (0.6.1-4build2) hirsute; urgency=medium +qtmir (0.6.1-5) unstable; urgency=medium - * No-change rebuild to get qtmir ungrouped from the Qt transition. + * debian/control: + + Replace D (qtmir-tests): qtdeclarative5-qtmir-plugin by qml-module-qtmir, + drop from D (qtmir-tests): autopilot-qt5 and python3-autopilot. (Closes: + #977134). + + Bump Standards-Version: to 4.5.1. No changes needed. + * debian/qtmir-tests.install: + + Drop DATADIR/qtmir/benachmarks/* from qtmir-tests bin:pkg. + * debian/patches: + + Add 2003_disable-benchmarks.patch. No autopilot in Debian, so let's build + qtmir without dependency on it (i.e. without benchmarks). - -- Dmitry Shachnev Mon, 30 Nov 2020 10:54:20 +0300 - -qtmir (0.6.1-4build1) hirsute; urgency=medium - - * No-change rebuild against qtbase-abi-5-15-2. - - -- Dmitry Shachnev Fri, 27 Nov 2020 18:58:00 +0300 + -- Mike Gabriel Wed, 16 Dec 2020 16:32:50 +0100 qtmir (0.6.1-4) unstable; urgency=medium diff -Nru qtmir-0.6.1/debian/control qtmir-0.6.1/debian/control --- qtmir-0.6.1/debian/control 2020-10-28 13:23:04.000000000 +0000 +++ qtmir-0.6.1/debian/control 2020-12-16 15:31:24.000000000 +0000 @@ -46,7 +46,7 @@ # mirtest pkgconfig requires these, but doesn't have a deb dependency. Bug lp:1633537 libboost-filesystem-dev, libboost-system-dev, -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Rules-Requires-Root: no Homepage: https://github.com/ubports/qtmir Vcs-Git: https://salsa.debian.org/ubports-team/qtmir.git @@ -137,15 +137,13 @@ Architecture: any Multi-Arch: foreign Pre-Depends: ${misc:Pre-Depends}, -Depends: autopilot-qt5, - littler, +Depends: littler, lttng-tools, mir-test-tools, - python3-autopilot, python3-babeltrace, python3-evdev, python3-mir-perf-framework, - qtdeclarative5-qtmir-plugin, + qml-module-qtmir, qtmir-desktop (= ${binary:Version}) | qtmir-android (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, diff -Nru qtmir-0.6.1/debian/patches/2003_disable-benchmarks.patch qtmir-0.6.1/debian/patches/2003_disable-benchmarks.patch --- qtmir-0.6.1/debian/patches/2003_disable-benchmarks.patch 1970-01-01 00:00:00.000000000 +0000 +++ qtmir-0.6.1/debian/patches/2003_disable-benchmarks.patch 2020-12-16 15:29:55.000000000 +0000 @@ -0,0 +1,11 @@ +Description: Debian lacks Canonical's autopilot toolchain, thus disabling benchmarks (which depends on it). +Author: Mike Gabriel + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -196,4 +196,4 @@ + # add subdirectories to build + add_subdirectory(src) + add_subdirectory(demos) +-add_subdirectory(benchmarks) ++#add_subdirectory(benchmarks) diff -Nru qtmir-0.6.1/debian/patches/series qtmir-0.6.1/debian/patches/series --- qtmir-0.6.1/debian/patches/series 2020-10-30 16:50:43.000000000 +0000 +++ qtmir-0.6.1/debian/patches/series 2020-12-16 15:27:03.000000000 +0000 @@ -7,3 +7,4 @@ 2002_no-requires-provides-check.patch 1007_make-valgrind-dependency-optional.patch 1008_drop-Werror-enforcement-leave-it-to-configure-option.patch +2003_disable-benchmarks.patch diff -Nru qtmir-0.6.1/debian/qtmir-tests.install qtmir-0.6.1/debian/qtmir-tests.install --- qtmir-0.6.1/debian/qtmir-tests.install 2020-10-24 22:17:34.000000000 +0000 +++ qtmir-0.6.1/debian/qtmir-tests.install 2020-12-16 15:25:35.000000000 +0000 @@ -1,6 +1,5 @@ usr/bin/qtmir-demo-client usr/bin/qtmir-demo-shell usr/share/applications/qtmir-demo-client.desktop -usr/share/qtmir/benchmarks/* usr/share/qtmir/qtmir-demo-client/* usr/share/qtmir/qtmir-demo-shell/*