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

Imported using git-ubuntu import.

Changelog parent: 80e1ad9cbf

New changelog entries:
  * touch/48-setup-env.chroot: QML2_IMPORT_PATH should respect
    DEB_HOST_MULTIARCH (as we now have i386 builds as well)
impish
Ricardo Salveti de Araujo 11 years ago committed by usd-importer
parent 80e1ad9cbf
commit 34a87f0754

7
debian/changelog vendored

@ -1,3 +1,10 @@
livecd-rootfs (2.205) trusty; urgency=medium
* touch/48-setup-env.chroot: QML2_IMPORT_PATH should respect
DEB_HOST_MULTIARCH (as we now have i386 builds as well)
-- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Tue, 18 Feb 2014 23:51:24 -0300
livecd-rootfs (2.204) trusty; urgency=medium livecd-rootfs (2.204) trusty; urgency=medium
* Make livecd-rootfs be Architecture: any so that we can go back to the * Make livecd-rootfs be Architecture: any so that we can go back to the

@ -2,6 +2,8 @@
echo "I: setting up initial environment for Touch..." echo "I: setting up initial environment for Touch..."
DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
echo "HOSTNAME=android echo "HOSTNAME=android
TERM=linux TERM=linux
ANDROID_CACHE=/cache ANDROID_CACHE=/cache
@ -13,7 +15,7 @@ ANDROID_BOOTLOGO=1
LD_LIBRARY_PATH=/vendor/lib:/system/lib LD_LIBRARY_PATH=/vendor/lib:/system/lib
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ANDROID_DATA=/data ANDROID_DATA=/data
QML2_IMPORT_PATH=/usr/lib/arm-linux-gnueabihf/qt5/imports QML2_IMPORT_PATH=/usr/lib/$DEB_HOST_MULTIARCH/qt5/imports
QT_SELECT=qt5 QT_SELECT=qt5
SHLVL=1 SHLVL=1
MKSH=/system/bin/sh MKSH=/system/bin/sh

Loading…
Cancel
Save