merge 2.89

debian/changelog

@@ -1,4 +1,4 @@
-livecd-rootfs (2.89) UNRELEASED; urgency=low
+livecd-rootfs (2.90) UNRELEASED; urgency=low
 
   * live-build/auto/build: If they exist, link *.efi.signed versions of the
     kernel to binary/$INITFS/kernel-$FLAVOUR rather than the unsigned
@@ -6,6 +6,13 @@ livecd-rootfs (2.89) UNRELEASED; urgency=low
 
  -- Colin Watson <cjwatson@ubuntu.com>  Thu, 11 Oct 2012 02:16:26 +0100
 
+livecd-rootfs (2.89) quantal; urgency=low
+
+  * fix lubuntu and xubuntu preinstalled handling so we end up with the
+    right slideshows in oem-config
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 02 Oct 2012 23:56:33 +0200
+
 livecd-rootfs (2.88) quantal; urgency=low
 
   * live-build/auto/config: Add photography and publishing metas for

live-build/auto/config

@@ -136,6 +136,14 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
 			add_package live oem-config-kde ubiquity-frontend-kde
 			add_package live ubiquity-slideshow-kubuntu
 			;;
+		lubuntu*)
+			add_package live oem-config-gtk ubiquity-frontend-gtk
+			add_package live ubiquity-slideshow-lubuntu
+			;;
+		xubuntu*)
+			add_package live oem-config-gtk ubiquity-frontend-gtk
+			add_package live ubiquity-slideshow-xubuntu
+			;;
 		ubuntu-server)
 			add_package live oem-config-debconf ubiquity-frontend-debconf
 			;;