diff --git a/debian/changelog b/debian/changelog index 59f44061..97926a5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.231) UNRELEASED; urgency=medium + + * Hard-code installation of libmirclientplatform-android and + libmirplatformgraphics-android to avoid accidentally pulling in the + -mesa variants that are preferred as dependencies of libmirclient and + libmirserver. + + -- Steve Langasek Mon, 28 Jul 2014 20:15:43 -0700 + livecd-rootfs (2.230) utopic; urgency=low * lp:~mvo/livecd-rootfs/ubuntu-core-system-image: diff --git a/live-build/auto/config b/live-build/auto/config index 37cc6f71..bd5eaca1 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -335,7 +335,7 @@ case $PROJECT in ;; ubuntu-touch) - add_package install ubuntu-minimal ubuntu-touch + add_package install ubuntu-minimal libmirclientplatform-android libmirplatformgraphics-android ubuntu-touch COMPONENTS='main restricted universe' BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu' export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg'