Merge lp:~townsend/unity8-session-snap/change-xmir-helper into lp:unity8-session-snap

[Christopher Townsend]

Change references to xmir-helper to xmir-launch since Xmir launching is being moved from u-a-l to libertine.

******* NOTE *********
Do not merge this until https://bileto.ubuntu.com/#/ticket/2264 lands.

Unmerged revisions

125. By Christopher Townsend on 2017-03-29

Change references to xmir-helper to xmir-launch since Xmir launching is being moved from u-a-l to libertine.

=== modified file 'overlay/snappyenv'
--- overlay/snappyenv	2017-02-27 19:16:28 +0000
+++ overlay/snappyenv	2017-03-29 17:12:02 +0000
@@ -60,7 +60,7 @@
 export UBUNTU_APP_LAUNCH_DEMANGLER=$SNAP/usr/lib/$ARCH/ubuntu-app-launch/socket-demangler
 export UBUNTU_APP_LAUNCH_OOM_HELPER=$SNAP/usr/lib/$ARCH/ubuntu-app-launch/oom-adjust-setuid-helper
 export UBUNTU_APP_LAUNCH_LIBERTINE_LAUNCH=$SNAP/bin/snappy-libertine-launch
-export UBUNTU_APP_LAUNCH_SNAPPY_XMIR_HELPER=/snap/bin/unity8-session.xmir-helper
+export UBUNTU_APP_LAUNCH_SNAPPY_XMIR_HELPER=/snap/bin/unity8-session.xmir-launch
 export UBUNTU_APP_LAUNCH_XMIR_PATH=$SNAP/bin/snappy-xmir
 
 # Qt Platform to Mir

=== modified file 'snap/snapcraft.yaml'
--- snap/snapcraft.yaml	2017-03-22 13:38:34 +0000
+++ snap/snapcraft.yaml	2017-03-29 17:12:02 +0000
@@ -250,8 +250,8 @@
     command: upstart-wrapper ${SNAP}/snappyenv ${SNAP}/usr/bin/url-dispatcher
   bustle-pcap:
     command: upstart-wrapper ${SNAP}/snappyenv ${SNAP}/usr/bin/bustle-pcap
-  xmir-helper:
-    command: snappyenv ${SNAP}/usr/lib/*/ubuntu-app-launch/xmir-helper
+  xmir-launch:
+    command: snappyenv ${SNAP}/usr/bin/xmir-launch
     plugs: [opengl]
   initctl:
     command: upstart-wrapper ${SNAP}/snappyenv ${SNAP}/sbin/initctl --user