diff --git a/debian/changelog b/debian/changelog index 8d869ec9..c1326071 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ livecd-rootfs (2.317) UNRELEASED; urgency=medium + [ Sebastien Bacher ] * live-build/ubuntu-desktop-next/hooks/20-extra-files.chroot: - create other needed directories * live-build/ubuntu-desktop-next/includes.chroot: @@ -9,7 +10,11 @@ livecd-rootfs (2.317) UNRELEASED; urgency=medium the users are added by the script and not the usual postinst so their uderdirs are not created as they should - -- Sebastien Bacher Fri, 19 Jun 2015 10:26:41 +0200 + [ Oliver Grawert ] + * allow install of "multi" click packages in 60-install-click.chroot on + ubuntu-touch + + -- Oliver Grawert Fri, 19 Jun 2015 10:42:53 +0200 livecd-rootfs (2.316) wily; urgency=medium diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot index fa4401ec..81468447 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot @@ -25,7 +25,7 @@ CLICKARCH=$(dpkg --print-architecture) wget --no-verbose -O "$tmpdir/click_list" "$click_list" for package in $(cat "$tmpdir/click_list") do - if echo $package | egrep -q "_$CLICKARCH.click|_all.click|_unknown.click"; then + if echo $package | egrep -q "_$CLICKARCH.click|_all.click|_unknown.click|_multi.click"; then echo "Setting up $package" wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package" # FIXME: first attempt, a hard-coded list of the packages that go to