From c99101f413c149720c2e8bf404a05fba01347246 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 14 Jun 2013 16:11:33 +0200 Subject: [PATCH] Import patches-unapplied version 2.149 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: fad2ce5b7010f9effeb8a89bb5d5413dc1c6fa40 New changelog entries: * set QT_SELECT=qt5 in touch image environment --- debian/changelog | 6 ++++++ live-build/ubuntu-touch/hooks/48-setup-env.chroot | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6d1912a7..dd4b350c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.149) saucy; urgency=low + + * set QT_SELECT=qt5 in touch image environment + + -- Oliver Grawert Fri, 14 Jun 2013 16:11:33 +0200 + livecd-rootfs (2.148) saucy; urgency=low [ Colin Watson ] diff --git a/live-build/ubuntu-touch/hooks/48-setup-env.chroot b/live-build/ubuntu-touch/hooks/48-setup-env.chroot index cc9036ca..53b40866 100755 --- a/live-build/ubuntu-touch/hooks/48-setup-env.chroot +++ b/live-build/ubuntu-touch/hooks/48-setup-env.chroot @@ -16,6 +16,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ANDROID_DATA=/data QT_QPA_PLATFORM=ubuntu QML2_IMPORT_PATH=/usr/lib/arm-linux-gnueabihf/qt5/imports +QT_SELECT=qt5 SHLVL=1 MKSH=/system/bin/sh ANDROID_ROOT=/system