Import patches-unapplied version 1.165 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 746b2cea47

New changelog entries:
  * Drop the hack that removes ubiquity-slideshow-* on armel, webkit works
    again.
impish
Oliver Grawert 14 years ago committed by usd-importer
parent 746b2cea47
commit 3c3c9f040b

7
debian/changelog vendored

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

@ -580,14 +580,6 @@ Pin-Priority: 900
chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \ chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \
> livecd.${FSS}.manifest > 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" checkpoint "Cleaning up"
kill_users kill_users

Loading…
Cancel
Save