From 3c3c9f040b3365bd4cd1bb51c1a8c9a6c0f41b3f Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 16 Mar 2011 12:09:28 +0100
Subject: [PATCH] Import patches-unapplied version 1.165 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 746b2cea479bc8c1d08db6aa8de1c86ed73ca8df

New changelog entries:
  * Drop the hack that removes ubiquity-slideshow-* on armel, webkit works
    again.
---
 debian/changelog | 7 +++++++
 livecd.sh        | 8 --------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40ded7c3..4a133488 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
   * Use Edubuntu theming for Edubuntu LTSP chroot.
diff --git a/livecd.sh b/livecd.sh
index 6cb9d378..7b81130b 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -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