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

[Thomi Richards]

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

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

[Michael Terry (mterry)]

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:188
http://jenkins.qa.ubuntu.com/job/autopilot-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-armhf-ci/61

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-04-30 17:11:46 +0000
+++ debian/control	2013-05-02 17:28:32 +0000
@@ -22,22 +22,13 @@
 
 Package: python-autopilot
 Architecture: all
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Depends: ${misc:Depends},
          ${python:Depends},
-         gir1.2-gconf-2.0,
-         gir1.2-glib-2.0,
-         gir1.2-gtk-2.0,
-         gir1.2-ibus-1.0,
+         autopilot-desktop | autopilot-touch,
          python-dbus,
          python-junitxml,
-         python-qt4,
-         python-qt4-dbus,
          python-testscenarios,
          python-testtools,
-         python-xdg,
-         python-xlib,
-         python-zeitgeist,
 Recommends: libautopilot-gtk (>= 1.3),
             libautopilot-qt (>= 1.3),
 Description: Utility to write and run integration tests easily
@@ -46,6 +37,32 @@
  keyboard. It also provides a lot of utilities linked to the X server
  and detecting applications.
 
+Package: autopilot-touch
+Architecture: all
+Section: metapackages
+Depends: ${misc:Depends},
+         python-autopilot,
+         python-evedv,
+         python-upa,
+Recommends: libautopilot-qt (>= 1.3),
+Description: Autopilot support for the ubuntu Touch platform
+ This metapackage exists to depend on the packages needed to install and use
+ autopilot on the Ubuntu Touch platform.
+
+Package: autopilot-desktop
+Architecture: all
+Section: metapackages
+Depends: ${misc:Depends},
+         gir1.2-gconf-2.0,
+         gir1.2-glib-2.0,
+         gir1.2-gtk-2.0,
+         gir1.2-ibus-1.0,
+         python-autopilot,
+         python-xlib,
+Description: Autopilot support for the ubuntu Desktop platform
+ This metapackage exists to depend on the packages needed to install and use
+ autopilot on the Ubuntu Desktop platform.
+
 Package: python-autopilot-vis
 Architecture: all
 Depends: ${misc:Depends},
@@ -61,8 +78,7 @@
 
 Package: python-autopilot-tests
 Architecture: all
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Depends: ${misc:Depends},
          ${python:Depends},
          python-autopilot,
          libautopilot-qt,