Merge lp:~saviq/qtmir/update-packaging into lp:qtmir

[Michał Sawicz]

Clean up packaging and fix autopkgtest on armhf

[Gerry Boland (gerboland)]

Looks reasonable, will let CI confirm

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:401
http://jenkins.qa.ubuntu.com/job/qtmir-ci/532/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/228
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/228/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/110
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/265/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/265/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/110/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/532/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

All good

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-10-21 11:46:54 +0000
+++ debian/control	2015-10-27 16:03:59 +0000
@@ -14,12 +14,11 @@
                libmirclient-dev (>= 0.17.0),
                libmircommon-dev (>= 0.17.0),
                libmirserver-dev (>= 0.17.0),
-               mir-renderer-gl-dev (>= 0.17.0),
                libmtdev-dev,
                libprocess-cpp-dev,
+               libqt5sensors5-dev,
                libqtdbusmock1-dev (>= 0.2),
                libqtdbustest1-dev (>= 0.2),
-               libqt5sensors5-dev,
                libubuntu-app-launch2-dev,
                libubuntu-application-api-dev (>= 2.1.0),
                libudev-dev,
@@ -27,6 +26,7 @@
                liburl-dispatcher1-dev,
                libxkbcommon-dev,
                libxrender-dev,
+               mir-renderer-gl-dev (>= 0.17.0),
                pkg-config,
 # lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147
                python3:any,
@@ -111,8 +111,8 @@
          python3-babeltrace,
          python3-evdev,
          python3-mir-perf-framework,
+         qtdeclarative5-qtmir-plugin,
          qtmir-desktop (= ${source:Version}) | qtmir-android (= ${source:Version}),
-         qtdeclarative5-qtmir-plugin,
          ${misc:Depends},
          ${shlibs:Depends},
 Description: QtMir tests and demos

=== modified file 'debian/copyright'
--- debian/copyright	2015-08-11 12:10:03 +0000
+++ debian/copyright	2015-10-27 16:03:59 +0000
@@ -2,16 +2,16 @@
 Upstream-Name: qtmir
 
 Files: *
-Copyright: 2013-2014 Canonical Ltd.
+Copyright: 2013-2015 Canonical Ltd.
 License: LGPL-3
 
 Files: debian/*
-Copyright: 2013-2014 Canonical Ltd.
+Copyright: 2013-2015 Canonical Ltd.
 License: GPL-3
 
 Files: tests/*
-Copyright: 2013-2014 Canonical Ltd.
-License: LGPL-3
+Copyright: 2013-2015 Canonical Ltd.
+License: GPL-3
 
 License: LGPL-3
  This package is free software; you can redistribute it and/or

=== modified file 'debian/qtmir-tests.install'
--- debian/qtmir-tests.install	2015-09-01 16:16:47 +0000
+++ debian/qtmir-tests.install	2015-10-27 16:03:59 +0000
@@ -1,6 +1,6 @@
+usr/bin/qtmir-demo-client
 usr/bin/qtmir-demo-shell
-usr/bin/qtmir-demo-client
 usr/share/applications/qtmir-demo-client.desktop
+usr/share/qtmir/benchmarks/*
+usr/share/qtmir/qtmir-demo-client/*
 usr/share/qtmir/qtmir-demo-shell/
-usr/share/qtmir/qtmir-demo-client/*
-usr/share/qtmir/benchmarks/*

=== modified file 'debian/tests/control'
--- debian/tests/control	2015-01-15 18:32:56 +0000
+++ debian/tests/control	2015-10-27 16:03:59 +0000
@@ -1,3 +1,5 @@
 Tests: run-tests
 Restrictions: build-needed
-Depends: @,
+Depends: qtdeclarative5-qtmir-plugin,
+         qtmir-desktop,
+         qtmir-tests,