Merge lp:~vorlon/mediaplayer-app/python-autopilot into lp:mediaplayer-app

Proposed by Steve Langasek
Status: Merged
Merged at revision: 224
Proposed branch: lp:~vorlon/mediaplayer-app/python-autopilot
Merge into: lp:mediaplayer-app
Diff against target: 26 lines (+8/-0)
2 files modified
debian/changelog (+7/-0)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~vorlon/mediaplayer-app/python-autopilot
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+218720@code.launchpad.net

Commit message

Add a dependency from mediaplayer-app-autopilot to python-autopilot, since this will in the future not be included in the image by default.

Description of the change

python-autopilot (i.e., python2) is to be removed from the Ubuntu Touch
images. The mediaplayer-app-autopilot testsuite deb therefore needs to
depend on python-autopilot explicitly.

This has already been uploaded to the archive, so please merge it into trunk.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:224
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~vorlon/mediaplayer-app/python-autopilot/+merge/218720/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/193/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/83
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-i386-ci/1
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/202
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/202/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6925
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/108
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/108/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediaplayer-app-ci/193/rebuild

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-05-02 13:43:16 +0000
3+++ debian/changelog 2014-05-07 23:34:05 +0000
4@@ -1,3 +1,10 @@
5+mediaplayer-app (0.20.5+14.10.20140502-0ubuntu2) utopic; urgency=medium
6+
7+ * Add a dependency from mediaplayer-app-autopilot to python-autopilot, since
8+ this will in the future not be included in the image by default.
9+
10+ -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 07 May 2014 16:30:37 -0700
11+
12 mediaplayer-app (0.20.5+14.10.20140502-0ubuntu1) utopic; urgency=low
13
14 [ Jim Hodapp ]
15
16=== modified file 'debian/control'
17--- debian/control 2014-04-29 13:43:13 +0000
18+++ debian/control 2014-05-07 23:34:05 +0000
19@@ -43,6 +43,7 @@
20 libqt5test5,
21 libqt5widgets5,
22 mediaplayer-app (>= ${source:Version}),
23+ python-autopilot,
24 Conflicts: media-player-autopilot
25 Replaces: media-player-autopilot
26 Provides: media-player-autopilot

Subscribers

People subscribed via source and target branches