From bd1b5431d0649e3d9458dc91fd319f8c445b9d16 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 21 Jun 2011 17:41:26 +0100 Subject: [PATCH] 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). --- debian/changelog | 6 ++++++ live-build/auto/config | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5dd04de7..09d511dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.7) oneiric; urgency=low + + * Install xubuntu-live for xubuntu, not edubuntu-live (LP: #800211). + + -- Colin Watson Tue, 21 Jun 2011 17:41:26 +0100 + livecd-rootfs (2.6) oneiric; urgency=low * '--initramfs none' produces *.packages* outputs rather than *.manifest*; diff --git a/live-build/auto/config b/live-build/auto/config index 6a3d3151..db93e71d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -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' ;;