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

[Dimitri John Ledkov]

matching merge proposal for:
https://code.launchpad.net/~xnox/autopilot/restructure-dependencies/+merge/217995

In short:

For qt & python3 -> use python3-autopilot
For qt & python2 -> use python-autopilot
For gtk/x & python3 -> use python3-autopilot & autopilot-desktop
For gtk/x & python2 -> use python-autopilot & autopilot-desktop

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:489
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/~xnox/autopilot/legacy/+merge/217997/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-amd64-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-amd64-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-i386-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-i386-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/6
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/7
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/12
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/12/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6515/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6677

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

review: Needs Fixing (continuous-integration)

[Dimitri John Ledkov (xnox)]

actually i'm changing my mind. I think we can achieve the same with less changes.

review: Disapprove

Unmerged revisions

489. By Dimitri John Ledkov on 2014-05-02

Don't introduce new, empty packages, for legacy.

=== modified file 'debian/control'
--- debian/control	2014-04-28 19:34:07 +0000
+++ debian/control	2014-05-02 00:54:13 +0000
@@ -55,13 +55,10 @@
          python-testscenarios,
          python-testtools,
          udev,
-Recommends: autopilot-desktop-legacy | autopilot-touch-legacy,
-            libautopilot-gtk (>= 1.4),
-            libautopilot-qt (>= 1.4),
+         fbset,
+         libautopilot-qt
+Recommends: autopilot-desktop,
             python-autopilot-trace,
-            recordmydesktop,
-Breaks: libautopilot-gtk (<< 1.4),
-	libautopilot-qt (<< 1.4),
 Description: Utility to write and run integration tests easily
  The autopilot engine enables to ease the writing of python tests
  for your application manipulating your inputs like the mouse and
@@ -82,38 +79,6 @@
  .
  This is the legacy Python 2 support.
 
-Package: autopilot-touch-legacy
-Architecture: all
-Section: metapackages
-Depends: ${misc:Depends},
-         libautopilot-qt (>= 1.4),
-         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
- autopilot on the Ubuntu Touch platform.
- .
- This is the legacy Python 2 support.
-
-Package: autopilot-desktop-legacy
-Architecture: all
-Section: metapackages
-Depends: ${misc:Depends},
-         gir1.2-gconf-2.0,
-         gir1.2-glib-2.0,
-         gir1.2-gtk-3.0,
-         python-autopilot,
-         python-xlib,
-         bamfdaemon,
-Recommends: python-autopilot-vis,
-            python-evdev,
-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.
- .
- This is the legacy Python 2 support.
-
 Package: python-autopilot-vis
 Architecture: all
 Depends: ${misc:Depends},