From 57c496193f511f42fbb3f88034bcdc66b46b4a5b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 23 Mar 2012 14:21:12 +0000 Subject: [PATCH] Import patches-unapplied version 2.64 to ubuntu/precise Imported using git-ubuntu import. Changelog parent: a784184f1845c4c2de24c7963004791cf69fefeb New changelog entries: * Add minimal and standard tasks to Ubuntu Studio images (LP: #962585). --- debian/changelog | 6 ++++++ live-build/auto/config | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fcde678f..c7486d6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.64) precise; urgency=low + + * Add minimal and standard tasks to Ubuntu Studio images (LP: #962585). + + -- Colin Watson Fri, 23 Mar 2012 14:21:12 +0000 + livecd-rootfs (2.63) precise; urgency=low * Add the ubiquity slideshow back to PREINSTALLED images (LP: #960688) diff --git a/live-build/auto/config b/live-build/auto/config index 5e4c28e8..9f42a948 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -178,7 +178,7 @@ case $PROJECT in ;; ubuntustudio-dvd) - add_task install ubuntustudio-desktop ubuntustudio-generation ubuntustudio-recording ubuntustudio-font-meta ubuntustudio-graphics ubuntustudio-audio-plugins ubuntustudio-video + add_task install minimal standard ubuntustudio-desktop ubuntustudio-generation ubuntustudio-recording ubuntustudio-font-meta ubuntustudio-graphics ubuntustudio-audio-plugins ubuntustudio-video COMPONENTS='main restricted universe multiverse' case $ARCH in i386) KERNEL_FLAVOURS=lowlatency-pae ;;