Merge lp:~ogra/utah/fix-dbus-location into lp:utah

[Oliver Grawert]

fix dbus session bus address location

fixes the location to read dbus session bus address from

[Javier Collado (javier.collado)]

I have been able to verify in a device that the new location is correct, but I'd like Andy to review the changes as well since he's more familiar with they might have an effect in some other part.

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-12 20:43:09 +0000
+++ debian/changelog	2013-07-17 11:40:35 +0000
@@ -1,3 +1,10 @@
+utah (0.14.1ubuntu2) UNRELEASED; urgency=low
+
+  * make sure phablet tests use the right location to read the dbus session
+    address
+
+ -- Oliver Grawert <[e-mail]>  Wed, 17 Jul 2013 13:30:48 +0200
+
 utah (0.14.1ubuntu1) raring; urgency=low
 
   * fixed some edge cases for tests that reboot

=== modified file 'examples/run_utah_phablet.py'
--- examples/run_utah_phablet.py	2013-07-12 20:43:09 +0000
+++ examples/run_utah_phablet.py	2013-07-17 11:40:35 +0000
@@ -131,7 +131,7 @@
     buf = [
         '#!/bin/sh',
         'chmod 666 /dev/uinput',
-        'export $(grep SESSION /home/phablet/.dbus-session)',
+        'export $(grep SESSION /home/phablet/.cache/upstart/dbus-session)',
         'sudo -i -u phablet {} \\'.format(env),
         '  DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS autopilot $*',
     ]