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

[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)

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.

Unmerged revisions

524. By Christopher Lee on 2014-06-17

Change build depends so we can build on trusty (rename from upstart-app-launch -> ubuntu-app-launch) as well as import rename if needed.

=== modified file 'autopilot/application/_launcher.py'
--- autopilot/application/_launcher.py	2014-06-12 22:37:24 +0000
+++ autopilot/application/_launcher.py	2014-06-17 04:31:58 +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 04:31:58 +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,