diff --git a/debian/changelog b/debian/changelog index cfed7ec1..3c6722e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.106) UNRELEASED; urgency=low + + * re-enable all slideshows on all preinstalled images, webkit should work + again + + -- Oliver Grawert Mon, 03 Dec 2012 14:37:01 +0100 + livecd-rootfs (2.105) raring; urgency=low * preseed autologin in the nexus7 tarball diff --git a/live-build/auto/config b/live-build/auto/config index 2962bb86..55e07707 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -134,18 +134,15 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then case $PROJECT in kubuntu*) add_package live oem-config-kde ubiquity-frontend-kde - # work around quantal bug 1066046 (webkit crashes teh slideshow) - #add_package live ubiquity-slideshow-kubuntu + add_package live ubiquity-slideshow-kubuntu ;; lubuntu*) add_package live oem-config-gtk ubiquity-frontend-gtk - # work around quantal bug 1066046 (webkit crashes teh slideshow) - # add_package live ubiquity-slideshow-lubuntu + add_package live ubiquity-slideshow-lubuntu ;; xubuntu*) add_package live oem-config-gtk ubiquity-frontend-gtk - # work around quantal bug 1066046 (webkit crashes teh slideshow) - #add_package live ubiquity-slideshow-xubuntu + add_package live ubiquity-slideshow-xubuntu ;; ubuntu-server) add_package live oem-config-debconf ubiquity-frontend-debconf @@ -154,8 +151,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then ;; *) add_package live oem-config-gtk ubiquity-frontend-gtk - # work around quantal bug 1066046 (webkit crashes teh slideshow) - #add_package live ubiquity-slideshow-ubuntu + add_package live ubiquity-slideshow-ubuntu ;; esac fi