diff --git a/debian/changelog b/debian/changelog index 9db4bced..76f2d37f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.189) UNRELEASED; urgency=low + + * Explicitly add the ubuntu-desktop task to Edubuntu builds, so that any + ambiguous dependencies resolved by the contents of the ubuntu-desktop + task are actually resolved reliably. + + -- Colin Watson Tue, 24 Sep 2013 16:57:39 +0100 + livecd-rootfs (2.188) saucy; urgency=low * ship policykit rules for networkmanager, now that we use it on touch diff --git a/live-build/auto/config b/live-build/auto/config index e6011089..14feffad 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -221,7 +221,7 @@ case $PROJECT in ;; edubuntu|edubuntu-dvd) - add_task install minimal standard edubuntu-desktop-gnome + add_task install minimal standard ubuntu-desktop edubuntu-desktop-gnome LIVE_TASK='edubuntu-live' COMPONENTS='main restricted universe' ;;