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

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 177
Merged at revision: 177
Proposed branch: lp:~dobey/ubuntuone-credentials/fix-ap-deps
Merge into: lp:ubuntuone-credentials
Diff against target: 20 lines (+2/-1)
1 file modified
debian/control (+2/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-credentials/fix-ap-deps
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Leo Arias (community) Approve
Review via email: mp+252336@code.launchpad.net

Commit message

Update autopilot dependencies for the autopilot tests package.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Leo Arias (elopio) wrote :

Thanks.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-08-20 14:33:41 +0000
3+++ debian/control 2015-03-09 17:14:47 +0000
4@@ -43,7 +43,7 @@
5 Package: ubuntuone-credentials-autopilot
6 Architecture: all
7 Depends:
8- libautopilot-qt (>= 1.4),
9+ autopilot-qt5 (>= 1.4+14.10.20140820) | libautopilot-qt (>= 1.4),
10 python3-autopilot,
11 python3-fixtures,
12 python3-testtools,
13@@ -52,6 +52,7 @@
14 qtdeclarative5-test-plugin,
15 qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
16 qtdeclarative5-ubuntuone1.0,
17+ qttestability-autopilot | libautopilot-qt,
18 ubuntu-ui-toolkit-autopilot,
19 ${misc:Depends},
20 ${python:Depends},

Subscribers

People subscribed via source and target branches

to all changes: