diff -Nru livecd-rootfs-2.300.2+vivid2/debian/changelog livecd-rootfs-2.300.2+vivid3/debian/changelog --- livecd-rootfs-2.300.2+vivid2/debian/changelog 2015-07-08 22:12:20.000000000 +0000 +++ livecd-rootfs-2.300.2+vivid3/debian/changelog 2015-08-05 15:37:38.000000000 +0000 @@ -1,3 +1,10 @@ +livecd-rootfs (2.300.2+vivid3) vivid; urgency=medium + + * make sure we download the android package from the overlay PPA if it is + enabled in the EXTRA_PPAS variable (LP: #1481456) + + -- Oliver Grawert Wed, 05 Aug 2015 17:36:13 +0200 + livecd-rootfs (2.300.2+vivid2) vivid; urgency=medium * Split out the youtube scope to the custom tarball since some images can't diff -Nru livecd-rootfs-2.300.2+vivid2/live-build/auto/build livecd-rootfs-2.300.2+vivid3/live-build/auto/build --- livecd-rootfs-2.300.2+vivid2/live-build/auto/build 2015-04-07 20:03:09.000000000 +0000 +++ livecd-rootfs-2.300.2+vivid3/live-build/auto/build 2015-08-05 15:36:09.000000000 +0000 @@ -451,10 +451,12 @@ cp /etc/resolv.conf chroot/etc/resolv.conf fi - mv "${sourceslist}" "${sourceslist}.orig" - mv "${sourceslist}.d" "${sourceslist}.d.orig" - echo "deb $LB_PARENT_MIRROR_CHROOT ${LB_DISTRIBUTION} main universe multiverse restricted" >$sourceslist - Chroot chroot "apt-get -y update" + if [ ! "$EXTRA_PPAS" ]; then + mv "${sourceslist}" "${sourceslist}.orig" + mv "${sourceslist}.d" "${sourceslist}.d.orig" + echo "deb $LB_PARENT_MIRROR_CHROOT ${LB_DISTRIBUTION} main universe multiverse restricted" >$sourceslist + Chroot chroot "apt-get -y update" + fi Chroot chroot "apt-get -y install android" if [ "$ARCH" = "armhf" ]; then