Import patches-unapplied version 2.10 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: 518b7ae70c

New changelog entries:
  * Initial Wubi support.
impish
Evan Dandrea 14 years ago committed by usd-importer
parent 518b7ae70c
commit 8a101c3563

6
debian/changelog vendored

@ -1,3 +1,9 @@
livecd-rootfs (2.10) oneiric; urgency=low
* Initial Wubi support.
-- Evan Dandrea <ev@ubuntu.com> Mon, 04 Jul 2011 10:54:07 +0100
livecd-rootfs (2.9) oneiric; urgency=low livecd-rootfs (2.9) oneiric; urgency=low
* Rename the ARM headless image to ubuntu-server for oneiric * Rename the ARM headless image to ubuntu-server for oneiric

@ -47,11 +47,19 @@ add_package ()
OPTS= OPTS=
COMPONENTS= COMPONENTS=
BINARY_REMOVE_LINUX=: BINARY_REMOVE_LINUX=:
LIVE_TASK=
case $IMAGEFORMAT in case $IMAGEFORMAT in
ext2|ext3|ext4) ext2|ext3|ext4)
OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT" OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
add_package live jasper case $SUBPROJECT in
wubi)
add_package install lupin-support
;;
*)
add_package live jasper
;;
esac
;; ;;
*) *)
@ -62,47 +70,47 @@ esac
case $PROJECT in case $PROJECT in
ubuntu|ubuntu-dvd) ubuntu|ubuntu-dvd)
add_task install minimal standard ubuntu-desktop add_task install minimal standard ubuntu-desktop
add_task live ubuntu-live LIVE_TASK='ubuntu-live'
;; ;;
kubuntu|kubuntu-dvd) kubuntu|kubuntu-dvd)
add_task install minimal standard kubuntu-desktop add_task install minimal standard kubuntu-desktop
add_task live kubuntu-live LIVE_TASK='kubuntu-live'
;; ;;
kubuntu-mobile) kubuntu-mobile)
add_task install minimal standard kubuntu-mobile add_task install minimal standard kubuntu-mobile
add_task live kubuntu-mobile-live LIVE_TASK='kubuntu-mobile-live'
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
;; ;;
edubuntu|edubuntu-dvd) edubuntu|edubuntu-dvd)
add_task install minimal standard edubuntu-desktop-gnome add_task install minimal standard edubuntu-desktop-gnome
add_task live edubuntu-live LIVE_TASK='edubuntu-live'
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
;; ;;
xubuntu) xubuntu)
add_task install minimal standard xubuntu-desktop add_task install minimal standard xubuntu-desktop
add_package install xterm add_package install xterm
add_task live xubuntu-live LIVE_TASK='xubuntu-live'
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
;; ;;
ubuntu-netbook) ubuntu-netbook)
add_task install minimal standard ubuntu-netbook add_task install minimal standard ubuntu-netbook
add_task live netbook-live LIVE_TASK='netbook-live'
;; ;;
mythbuntu) mythbuntu)
add_task install minimal standard mythbuntu-desktop add_task install minimal standard mythbuntu-desktop
add_task live mythbuntu-live LIVE_TASK='mythbuntu-live'
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
;; ;;
lubuntu) lubuntu)
add_task install minimal standard lubuntu-desktop add_task install minimal standard lubuntu-desktop
add_task live lubuntu-live LIVE_TASK='lubuntu-live'
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
;; ;;
@ -119,6 +127,15 @@ case $PROJECT in
exit 2 exit 2
;; ;;
esac esac
case $SUBPROJECT in
wubi)
;;
*)
add_task live "$LIVE_TASK"
;;
esac
case $PROJECT in case $PROJECT in
*-dvd) *-dvd)
add_task live "$PROJECT-live" add_task live "$PROJECT-live"
@ -176,6 +193,12 @@ case $PROJECT in
;; ;;
esac esac
case $SUBPROJECT in
wubi)
ln -s /usr/share/live/build/examples/hooks/ubuntu_binary_build-wubildr.sh config/binary_local-hooks/
;;
esac
case $PROJECT in case $PROJECT in
*-dvd) *-dvd)
. config/bootstrap . config/bootstrap

Loading…
Cancel
Save