Drop the hack that removes ubiquity-slideshow-* on armel, webkit works again

This commit is contained in:
Oliver Grawert 2011-03-16 12:09:40 +01:00
parent f40f997ac5
commit d55193e0b9
2 changed files with 7 additions and 8 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (1.165) UNRELEASED; urgency=low
* Drop the hack that removes ubiquity-slideshow-* on armel, webkit works
again.
-- Oliver Grawert <ogra@ubuntu.com> Wed, 16 Mar 2011 12:08:28 +0100
livecd-rootfs (1.164) natty; urgency=low
* Use Edubuntu theming for Edubuntu LTSP chroot.

View File

@ -580,14 +580,6 @@ Pin-Priority: 900
chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \
> livecd.${FSS}.manifest
# HACK! HACK! HACK!
# Remove ubiquity-slideshow as webkit is completely hosed on armel
if [ "$TARGETARCH" = "armel" ]; then
checkpoint "Removing ubiquity-slideshow"
chroot ${ROOT} apt-get -y --purge remove ubiquity-slideshow-* \
</dev/null || true
fi
checkpoint "Cleaning up"
kill_users