Merge lp:~veebers/autopilot/fix-upstart-rename-1330803 into lp:autopilot

[Christopher Lee]

Change build deps and import attempt so autopilot is runnable/build-able on Trusty. (due to upstart-app-launch -> ubuntu-app-launch rename)

(Resubmitted to target the correct branch.)
Make autopilot build-able and runnable in Trusty (due to upstart-app-launch -> ubuntu-app-launch rename).

[Ted Gould (ted)]

This makes sense to me.

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:524
http://jenkins.qa.ubuntu.com/job/autopilot-ci/744/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1017
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1017/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1732
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1732/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6815
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8551

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

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

lgtm

review: Approve

=== modified file 'autopilot/application/_launcher.py'
--- autopilot/application/_launcher.py	2014-06-12 22:37:24 +0000
+++ autopilot/application/_launcher.py	2014-06-17 22:27:45 +0000
@@ -20,7 +20,12 @@
 """Base module for application launchers."""
 
 import fixtures
-from gi.repository import GLib, UbuntuAppLaunch
+from gi.repository import GLib
+try:
+    from gi.repository import UbuntuAppLaunch
+except ImportError:
+    # Note: the renamed package is not in Trusty.
+    from gi.repository import UpstartAppLaunch as UbuntuAppLaunch
 import json
 import logging
 import os

=== modified file 'debian/control'
--- debian/control	2014-05-29 16:43:08 +0000
+++ debian/control	2014-06-17 22:27:45 +0000
@@ -9,7 +9,7 @@
                gir1.2-gconf-2.0,
                gir1.2-gtk-3.0,
                gir1.2-ibus-1.0,
-               gir1.2-ubuntu-app-launch-2,
+               gir1.2-ubuntu-app-launch-2 | gir1.2-upstart-app-launch-2,
                graphviz,
                libjs-jquery,
                libjs-underscore,
@@ -42,7 +42,7 @@
 Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
-         gir1.2-ubuntu-app-launch-2,
+         gir1.2-ubuntu-app-launch-2 | gir1.2-upstart-app-launch-2,
          libjs-underscore, libjs-jquery,
          python3-dbus,
          python3-decorator,