Import patches-unapplied version 2.106 to ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: befa2e42520109f55a271bc042edd6b7eeb0040c

New changelog entries:
  * re-enable all slideshows on all preinstalled images, webkit should work
    again
This commit is contained in:
Oliver Grawert 2012-12-03 14:37:01 +01:00 committed by usd-importer
parent befa2e4252
commit 2cbe6e31d2
2 changed files with 11 additions and 8 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.106) raring; urgency=low
* re-enable all slideshows on all preinstalled images, webkit should work
again
-- Oliver Grawert <ogra@ubuntu.com> Mon, 03 Dec 2012 14:37:01 +0100
livecd-rootfs (2.105) raring; urgency=low livecd-rootfs (2.105) raring; urgency=low
* preseed autologin in the nexus7 tarball * preseed autologin in the nexus7 tarball

View File

@ -134,18 +134,15 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
case $PROJECT in case $PROJECT in
kubuntu*) kubuntu*)
add_package live oem-config-kde ubiquity-frontend-kde 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*) lubuntu*)
add_package live oem-config-gtk ubiquity-frontend-gtk 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*) xubuntu*)
add_package live oem-config-gtk ubiquity-frontend-gtk 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) ubuntu-server)
add_package live oem-config-debconf ubiquity-frontend-debconf 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 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 esac
fi fi