Import patches-unapplied version 2.92 to ubuntu/quantal

Imported using git-ubuntu import.

Changelog parent: 347609b607f407ee5a2ffe44c52fec7fa7516b92

New changelog entries:
  * disable all slideshows on al preinstalled images, due to (LP: #1066046)
    the installer crashes when trying to start up webkit for teh slideshow
This commit is contained in:
Oliver Grawert 2012-10-13 11:44:52 +02:00 committed by usd-importer
parent 347609b607
commit 96cd9adbcd
2 changed files with 15 additions and 4 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.92) quantal; urgency=low
* disable all slideshows on al preinstalled images, due to (LP: #1066046)
the installer crashes when trying to start up webkit for teh slideshow
-- Oliver Grawert <ogra@ubuntu.com> Sat, 13 Oct 2012 11:44:52 +0200
livecd-rootfs (2.91) quantal; urgency=low
* make sure preinstalled ac100 images have multiverse enabled in their

View File

@ -134,15 +134,18 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
case $PROJECT in
kubuntu*)
add_package live oem-config-kde ubiquity-frontend-kde
add_package live ubiquity-slideshow-kubuntu
# work around quantal bug 1066046 (webkit crashes teh slideshow)
#add_package live ubiquity-slideshow-kubuntu
;;
lubuntu*)
add_package live oem-config-gtk ubiquity-frontend-gtk
add_package live ubiquity-slideshow-lubuntu
# work around quantal bug 1066046 (webkit crashes teh slideshow)
# add_package live ubiquity-slideshow-lubuntu
;;
xubuntu*)
add_package live oem-config-gtk ubiquity-frontend-gtk
add_package live ubiquity-slideshow-xubuntu
# work around quantal bug 1066046 (webkit crashes teh slideshow)
#add_package live ubiquity-slideshow-xubuntu
;;
ubuntu-server)
add_package live oem-config-debconf ubiquity-frontend-debconf
@ -151,7 +154,8 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
;;
*)
add_package live oem-config-gtk ubiquity-frontend-gtk
add_package live ubiquity-slideshow-ubuntu
# work around quantal bug 1066046 (webkit crashes teh slideshow)
#add_package live ubiquity-slideshow-ubuntu
;;
esac
fi