Import patches-unapplied version 2.7 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: d53a7453594ff5ad64e34319d03bb10dac604b96

New changelog entries:
  * Install xubuntu-live for xubuntu, not edubuntu-live (LP: #800211).
This commit is contained in:
Colin Watson 2011-06-21 17:41:26 +01:00 committed by usd-importer
parent d53a745359
commit bd1b5431d0
2 changed files with 7 additions and 1 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.7) oneiric; urgency=low
* Install xubuntu-live for xubuntu, not edubuntu-live (LP: #800211).
-- Colin Watson <cjwatson@ubuntu.com> Tue, 21 Jun 2011 17:41:26 +0100
livecd-rootfs (2.6) oneiric; urgency=low
* '--initramfs none' produces *.packages* outputs rather than *.manifest*;

View File

@ -85,7 +85,7 @@ case $PROJECT in
xubuntu)
add_task install minimal standard xubuntu-desktop
add_package install xterm
add_task live edubuntu-live
add_task live xubuntu-live
COMPONENTS='main restricted universe multiverse'
;;