From ec9dcca06cf61f62dfb102c9b2f6cb52b1e97c8b Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 7 Aug 2013 19:17:43 +0200 Subject: [PATCH] Import patches-unapplied version 2.170 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 485503920cab8f388453abb19bbb3a8f6144d167 New changelog entries: * fix package mirror in android package install routine --- debian/changelog | 6 ++++++ live-build/auto/build | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b46b7461..958e5d06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.170) saucy; urgency=low + + * fix package mirror in android package install routine + + -- Oliver Grawert Wed, 07 Aug 2013 19:17:43 +0200 + livecd-rootfs (2.169) saucy; urgency=low * switch touch builds to use the packaged android img files (pending cdimage diff --git a/live-build/auto/build b/live-build/auto/build index c6a58254..c25b19ac 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -427,7 +427,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then mv "${sourceslist}" "${sourceslist}.orig" mv "${sourceslist}.d" "${sourceslist}.d.orig" - echo "deb ${MIRROR} saucy main universe multiverse restricted" >$sourceslist + echo "deb $LB_PARENT_MIRROR_CHROOT saucy main universe multiverse restricted" >$sourceslist Chroot chroot "apt-get -y update" Chroot chroot "apt-get -y install android"