Import patches-unapplied version 2.42 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: 3b110adb23

New changelog entries:
  * Explicitly select ubuquity frontend as well, to match the
    oem-config frontend, and avoid pulling in unwanted deps.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.42) oneiric; urgency=low
+
+  * Explicitly select ubuquity frontend as well, to match the
+    oem-config frontend, and avoid pulling in unwanted deps.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 06 Oct 2011 19:30:51 -0600
+
 livecd-rootfs (2.41) oneiric; urgency=low
 
   * Re-enable swap on jasper-using images, a regression from

live-build/auto/config

@@ -97,15 +97,15 @@ esac
 if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
 	case $PROJECT in
 		kubuntu*)
-			add_package live oem-config-kde
+			add_package live oem-config-kde ubiquity-frontend-kde
 			;;
 		ubuntu-server)
-			add_package live oem-config-debconf
+			add_package live oem-config-debconf ubiquity-frontend-debconf
 			;;
 		ubuntu-core|base)
 			;;
 		*)
-			add_package live oem-config-gtk
+			add_package live oem-config-gtk ubiquity-frontend-gtk
 			;;
 	esac
 fi