Merge lp:~vorlon/autopilot/no-qt4-for-autopilot-touch into lp:autopilot

[Steve Langasek]

autopilot-touch: depend on autopilot-qt5 and qttestability-autopilot instead of libautopilot-qt.

The autopilot-qt package has been refactored to let us drop Qt4 from the
phone. Depend directly on the Qt5 implementation instead.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:496
http://jenkins.qa.ubuntu.com/job/autopilot-ci/840/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/115
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/115/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3015
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/267
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3062
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4258
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4258/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10969
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2659
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2659/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Unmerged revisions

496. By Steve Langasek on 2014-08-04

autopilot-touch: depend on autopilot-qt5 and qttestability-autopilot
instead of libautopilot-qt.

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-13 00:31:08 +0000
+++ debian/changelog	2014-08-04 23:32:21 +0000
@@ -1,3 +1,26 @@
+autopilot (1.5.0+14.10.20140716-0ubuntu2) UNRELEASED; urgency=medium
+
+  * autopilot-touch: depend on autopilot-qt5 and qttestability-autopilot
+    instead of libautopilot-qt.
+
+ -- Steve Langasek <[e-mail]>  Tue, 05 Aug 2014 01:23:32 +0200
+
+autopilot (1.5.0+14.10.20140716-0ubuntu1) utopic; urgency=low
+
+  [ Thomi Richards ]
+  * Bug Fix: Attaching binary files to test results Bug Fix: Revert
+    NormalApplicationLauncher launch arg (cwd -> launch_dir) Flake8: Fix
+    for updated pep8 Build: Fix build deps for Trusty Feature: Adding
+    screenshot ability Feature: Terse logging output. (LP: #1078732)
+
+  [ Christopher Lee ]
+  * Bug Fix: Attaching binary files to test results Bug Fix: Revert
+    NormalApplicationLauncher launch arg (cwd -> launch_dir) Flake8: Fix
+    for updated pep8 Build: Fix build deps for Trusty Feature: Adding
+    screenshot ability Feature: Terse logging output. (LP: #1078732)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 16 Jul 2014 02:57:50 +0000
+
 autopilot (1.5.0+14.10.20140613-0ubuntu1) utopic; urgency=low
 
   [ Tarmac ]

=== modified file 'debian/control'
--- debian/control	2014-07-28 23:23:50 +0000
+++ debian/control	2014-08-04 23:32:21 +0000
@@ -87,7 +87,8 @@
 Architecture: all
 Section: metapackages
 Depends: ${misc:Depends},
-         libautopilot-qt (>= 1.4),
+         autopilot-qt5,
+         qttestability-autopilot,
          python3-autopilot,
          python3-evdev,
          fbset,