Merge lp:~dobey/ubuntuone-credentials/fix-ap-deps into lp:ubuntuone-credentials

[dobey]

Update autopilot dependencies for the autopilot tests package.

Update autopilot dependencies for the autopilot tests package.

For this package we use an or-dep, to maintain compatibility for building/installing on trusty which uses libautopilot-qt.

[Leo Arias (elopio)]

Thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:177
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-ci/120/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-08-20 14:33:41 +0000
+++ debian/control	2015-03-09 17:14:47 +0000
@@ -43,7 +43,7 @@
 Package: ubuntuone-credentials-autopilot
 Architecture: all
 Depends:
- libautopilot-qt (>= 1.4),
+ autopilot-qt5 (>= 1.4+14.10.20140820) | libautopilot-qt (>= 1.4),
  python3-autopilot,
  python3-fixtures,
  python3-testtools,
@@ -52,6 +52,7 @@
  qtdeclarative5-test-plugin,
  qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
  qtdeclarative5-ubuntuone1.0,
+ qttestability-autopilot | libautopilot-qt,
  ubuntu-ui-toolkit-autopilot,
  ${misc:Depends},
  ${python:Depends},