Merge lp:~thomir-deactivatedaccount/autopilot/fix-packaging into lp:autopilot

Proposed by Thomi Richards
Status: Merged
Approved by: Michael Terry
Approved revision: 188
Merged at revision: 189
Proposed branch: lp:~thomir-deactivatedaccount/autopilot/fix-packaging
Merge into: lp:autopilot
Diff against target: 71 lines (+29/-13)
1 file modified
debian/control (+29/-13)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/autopilot/fix-packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Michael Terry (community) Approve
Review via email: mp+162185@code.launchpad.net

Commit message

Change autopilot packaging to only install packages required on each platform.

Description of the change

Change autopilot packaging to only install packages required on each platform.

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Sure, seems fine. The circular dependency shouldn't cause a problem.

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 2013-04-30 17:11:46 +0000
3+++ debian/control 2013-05-02 17:28:32 +0000
4@@ -22,22 +22,13 @@
5
6 Package: python-autopilot
7 Architecture: all
8-Depends: ${shlibs:Depends},
9- ${misc:Depends},
10+Depends: ${misc:Depends},
11 ${python:Depends},
12- gir1.2-gconf-2.0,
13- gir1.2-glib-2.0,
14- gir1.2-gtk-2.0,
15- gir1.2-ibus-1.0,
16+ autopilot-desktop | autopilot-touch,
17 python-dbus,
18 python-junitxml,
19- python-qt4,
20- python-qt4-dbus,
21 python-testscenarios,
22 python-testtools,
23- python-xdg,
24- python-xlib,
25- python-zeitgeist,
26 Recommends: libautopilot-gtk (>= 1.3),
27 libautopilot-qt (>= 1.3),
28 Description: Utility to write and run integration tests easily
29@@ -46,6 +37,32 @@
30 keyboard. It also provides a lot of utilities linked to the X server
31 and detecting applications.
32
33+Package: autopilot-touch
34+Architecture: all
35+Section: metapackages
36+Depends: ${misc:Depends},
37+ python-autopilot,
38+ python-evedv,
39+ python-upa,
40+Recommends: libautopilot-qt (>= 1.3),
41+Description: Autopilot support for the ubuntu Touch platform
42+ This metapackage exists to depend on the packages needed to install and use
43+ autopilot on the Ubuntu Touch platform.
44+
45+Package: autopilot-desktop
46+Architecture: all
47+Section: metapackages
48+Depends: ${misc:Depends},
49+ gir1.2-gconf-2.0,
50+ gir1.2-glib-2.0,
51+ gir1.2-gtk-2.0,
52+ gir1.2-ibus-1.0,
53+ python-autopilot,
54+ python-xlib,
55+Description: Autopilot support for the ubuntu Desktop platform
56+ This metapackage exists to depend on the packages needed to install and use
57+ autopilot on the Ubuntu Desktop platform.
58+
59 Package: python-autopilot-vis
60 Architecture: all
61 Depends: ${misc:Depends},
62@@ -61,8 +78,7 @@
63
64 Package: python-autopilot-tests
65 Architecture: all
66-Depends: ${shlibs:Depends},
67- ${misc:Depends},
68+Depends: ${misc:Depends},
69 ${python:Depends},
70 python-autopilot,
71 libautopilot-qt,

Subscribers

People subscribed via source and target branches