Import patches-unapplied version 2.189 to ubuntu/saucy-proposed

Imported using git-ubuntu import.

Changelog parent: 1e86459dd5

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

@@ -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 <cjwatson@ubuntu.com>  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

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'
 		;;