From 17d25fe43c40688f2d12a5c6d3604ca9a4869fa6 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 24 Sep 2013 16:58:20 +0100 Subject: [PATCH] Import patches-unapplied version 2.189 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 1e86459dd54fd032aa19ed9e1abbafd7af70acd4 New changelog entries: * 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. --- debian/changelog | 8 ++++++++ live-build/auto/config | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9db4bced..1aeb50f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.189) saucy; 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:58:20 +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' ;;