From 6faa717bf7c4ac6dcabc7143862515a9aee90139 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Wed, 4 Feb 2015 04:43:37 -0700 Subject: [PATCH] Use the correct metapackage for edubuntu-desktop --- debian/changelog | 6 ++++++ live-build/auto/config | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8ad00bdf..8127523c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.208.4) UNRELEASED; urgency=medium + + * Use the correct metapackage for edubuntu-desktop + + -- Adam Conrad Wed, 04 Feb 2015 04:42:54 -0700 + livecd-rootfs (2.208.3) trusty; urgency=medium * Pull xserver-xorg-video-geode-lts-utopic out of the i386 images. diff --git a/live-build/auto/config b/live-build/auto/config index 6c7800e5..d2bb35c3 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -256,7 +256,7 @@ case $PROJECT in ;; edubuntu|edubuntu-dvd) - add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop edubuntu-desktop-gnome $UNITY_HWE_HINTS + add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop edubuntu-desktop $UNITY_HWE_HINTS add_package install $HWE_X_PACKAGES LIVE_TASK='edubuntu-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'