Import patches-unapplied version 2.207 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: ed058a9ed5

New changelog entries:
  * touch/80-enable-libhybris.chroot: making libhybris the default alternatives
    for EGL/GLESv2 on touch

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.207) trusty; urgency=medium
+
+  * touch/80-enable-libhybris.chroot: making libhybris the default alternatives
+    for EGL/GLESv2 on touch
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>  Tue, 18 Mar 2014 21:03:48 -0300
+
 livecd-rootfs (2.206) trusty; urgency=medium
 
   * dropping maguro and adding flo, changing golfish to generic in touchsubarches

live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+echo "I: making libhybris the default alternatives for ${DEB_HOST_MULTIARCH}_egl_conf"
+update-alternatives --set ${DEB_HOST_MULTIARCH}_egl_conf /usr/lib/$DEB_HOST_MULTIARCH/libhybris-egl/ld.so.conf
+
+# ldconfig needs to be run immediately as we're changing /etc/ld.so.conf.d/ with alternatives.
+LDCONFIG_NOTRIGGER=y ldconfig