Import patches-unapplied version 1.120 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: 1e0c61bcc3

New changelog entries:
  * add special case to ubuntu-netbook on omap3 and 4, we want jasper instead of
    casper in the initramfs

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (1.120) maverick; urgency=low
+
+  * add special case to ubuntu-netbook on omap3 and 4, we want jasper instead of
+    casper in the initramfs
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 15 Jun 2010 16:34:25 +0200
+
 livecd-rootfs (1.119) maverick; urgency=low
 
   * Depends: lzma

livecd.sh

@@ -255,6 +255,11 @@ Flags: seen
 	ubuntu-netbook)
 	    LIST="$LIST minimal^ standard^ ubuntu-netbook^"
 	    LIVELIST="netbook-live^ laptop-detect casper lupin-casper"
+		case $TARGETARCH+$SUBARCH in
+			armel+omap*)
+	    		LIVELIST="netbook-live^ laptop-detect jasper"
+				;;
+		esac
 	    ;;
 	mythbuntu)
 	    LIST="$LIST minimal^ standard^ mythbuntu-desktop^"