Merge lp:~xnox/autopilot/legacy-new into lp:autopilot/legacy

Proposed by Dimitri John Ledkov
Status: Needs review
Proposed branch: lp:~xnox/autopilot/legacy-new
Merge into: lp:autopilot/legacy
Diff against target: 49 lines (+5/-19)
1 file modified
debian/control (+5/-19)
To merge this branch: bzr merge lp:~xnox/autopilot/legacy-new
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Barry Warsaw Pending
Thomi Richards Pending
Autopilot Hackers Pending
Review via email: mp+218704@code.launchpad.net

Commit message

* python-autopilot
  - move libautopilot-qt from recommends to depends
  - add fbset depends
  - remove libautopilot-gtk, recordmydesktop, autopilot-touch-legacy recommends
* autopilot-touch-legacy
  - drop this package
* autopilot-desktop-legacy
  - remove python-evdev recommends
  - add recordmydesktop recommends

To post a comment you must log in.
lp:~xnox/autopilot/legacy-new updated
490. By Dimitri John Ledkov

recommend recordmydesktop

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

PASSED: Continuous integration, rev:490
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-amd64-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-amd64-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-i386-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-i386-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/35
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/31/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/106
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/106/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/203
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/203/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6565/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6926

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

review: Approve (continuous-integration)

Unmerged revisions

490. By Dimitri John Ledkov

recommend recordmydesktop

489. By Dimitri John Ledkov

Drop autopilot-touch-legacy, make python-autopilot depend on qt & recommend gtk.

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-04-28 19:34:07 +0000
3+++ debian/control 2014-05-07 21:05:54 +0000
4@@ -55,11 +55,11 @@
5 python-testscenarios,
6 python-testtools,
7 udev,
8-Recommends: autopilot-desktop-legacy | autopilot-touch-legacy,
9- libautopilot-gtk (>= 1.4),
10- libautopilot-qt (>= 1.4),
11+ libautopilot-qt (>= 1.4),
12+ python-evdev,
13+ fbset,
14+Recommends: autopilot-desktop-legacy,
15 python-autopilot-trace,
16- recordmydesktop,
17 Breaks: libautopilot-gtk (<< 1.4),
18 libautopilot-qt (<< 1.4),
19 Description: Utility to write and run integration tests easily
20@@ -82,20 +82,6 @@
21 .
22 This is the legacy Python 2 support.
23
24-Package: autopilot-touch-legacy
25-Architecture: all
26-Section: metapackages
27-Depends: ${misc:Depends},
28- libautopilot-qt (>= 1.4),
29- python-autopilot,
30- python-evdev,
31- fbset,
32-Description: Autopilot support for the ubuntu Touch platform
33- This metapackage exists to depend on the packages needed to install and use
34- autopilot on the Ubuntu Touch platform.
35- .
36- This is the legacy Python 2 support.
37-
38 Package: autopilot-desktop-legacy
39 Architecture: all
40 Section: metapackages
41@@ -107,7 +93,7 @@
42 python-xlib,
43 bamfdaemon,
44 Recommends: python-autopilot-vis,
45- python-evdev,
46+ recordmydesktop,
47 Description: Autopilot support for the ubuntu Desktop platform
48 This metapackage exists to depend on the packages needed to install and use
49 autopilot on the Ubuntu Desktop platform.

Subscribers

People subscribed via source and target branches