From a8cab4644013d2fdf2f365274531f1c426837fe0 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Thu, 27 Nov 2014 12:37:31 +0100 Subject: [PATCH] Import patches-unapplied version 2.270 to ubuntu/vivid-proposed Imported using git-ubuntu import. Changelog parent: a0b7ec336e1752cc1d0645cd301d2c352250eaa6 New changelog entries: * bump version of mir alternative in ubuntu-touch --- debian/changelog | 6 ++++++ live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 996f480a..f94cbd0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.270) vivid; urgency=medium + + * bump version of mir alternative in ubuntu-touch + + -- Oliver Grawert Thu, 27 Nov 2014 12:37:31 +0100 + livecd-rootfs (2.269) vivid; urgency=low * live-build/auto/{build,config}: diff --git a/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot b/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot index 84a24441..5ad50927 100755 --- a/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot +++ b/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot @@ -9,9 +9,9 @@ if dpkg -l libmirclient8driver-android 2>/dev/null|grep -q ^ii; then fi -if dpkg -l libmirplatform3driver-android 2>/dev/null|grep -q ^ii; then +if dpkg -l libmirplatform4driver-android 2>/dev/null|grep -q ^ii; then echo "I: making android the default alternatives for @DEB_HOST_MULTIARCH@_mirplatform3driver_conf" - update-alternatives --set @DEB_HOST_MULTIARCH@_mirplatform3driver_conf /usr/lib/@DEB_HOST_MULTIARCH@/platform3driver/android/ld.so.conf + update-alternatives --set @DEB_HOST_MULTIARCH@_mirplatform4driver_conf /usr/lib/@DEB_HOST_MULTIARCH@/platform4driver/android/ld.so.conf fi # ldconfig needs to be run immediately as we're changing /etc/ld.so.conf.d/ with alternatives.