Merge lp:~fginther/autopilot/restore-python2-deps into lp:autopilot

[Francis Ginther]

Revert r480 to restore python2 packages as autopilot-touch dependencies as not all tests have been updated.

Revert r480 to restore python2 packages as autopilot-touch dependencies as not all tests have been updated.

[Francis Ginther (fginther)]

This MP is available in case it's needed. I'm not familiar with the circumstances for removing these dependencies in r480.

[Francis Ginther (fginther)]

Setting to work in progress, discussion in IRC indicates that this mp may not be the way to address the bug.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:484
http://jenkins.qa.ubuntu.com/job/autopilot-ci/687/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/413
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/413/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/415
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/415/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/322
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/322/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-autopilot/141
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4185/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty-autopilot/126
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5051
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5051/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4484
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4484/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6416/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6128

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

review: Needs Fixing (continuous-integration)

[Oliver Grawert (ogra)]

looks good, please land

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:484
http://jenkins.qa.ubuntu.com/job/autopilot-ci/690/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/416
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/416/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/418
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/418/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/325
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/325/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-autopilot/144
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4188/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty-autopilot/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5056
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5056/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4489
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4489/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6419/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6136

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

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-04-02 19:32:40 +0000
+++ debian/control	2014-04-16 17:57:30 +0000
@@ -144,6 +144,8 @@
          libautopilot-qt (>= 1.4),
          python3-autopilot,
          python3-evdev,
+         python-autopilot,
+         python-evdev,
          fbset,
 Description: Autopilot support for the ubuntu Touch platform
  This metapackage exists to depend on the packages needed to install and use