From 0bdd19822012087c4b901a838f143c0bbdbc7383 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 28 Jul 2014 20:17:14 -0700 Subject: [PATCH] Import patches-unapplied version 2.231 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: d4626e0b8e1f819f869b2ec51979e0c531d26ac1 New changelog entries: * 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. --- debian/changelog | 9 +++++++++ live-build/auto/config | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 59f44061..89b88f86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.231) utopic; 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:17:14 -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'