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

Imported using git-ubuntu import.

Changelog parent: efa47e8566

New changelog entries:
  * make sure we build a plain filesystem for ubuntu-touch (this should
    automatically produce a preinstalled tarball)

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.130) saucy; urgency=low
+
+  * make sure we build a plain filesystem for ubuntu-touch (this should
+    automatically produce a preinstalled tarball)
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 06 May 2013 12:48:17 +0200
+
 livecd-rootfs (2.129) saucy; urgency=low
 
   * Disable zsync for ubuntu-touch images.

live-build/auto/config

@@ -152,7 +152,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
 		ubuntu-server)
 			add_package live oem-config-debconf ubiquity-frontend-debconf
 			;;
-		ubuntu-core|base)
+		ubuntu-core|base|ubuntu-touch)
 			;;
 		*)
 			add_package live oem-config-gtk ubiquity-frontend-gtk
@@ -268,11 +268,9 @@ case $PROJECT in
 	ubuntu-touch)
 		add_package install ubuntu-minimal ubuntu-touch
 		COMPONENTS='main restricted universe'
-		BINARY_IMAGES=tar
 		BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'
 		export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg'
 		OPTS="${OPTS:+$OPTS }--apt-recommends false"
-		OPTS="${OPTS:+$OPTS }--binary-filesystem ext4"
 		OPTS="${OPTS:+$OPTS }--compression gzip"
 		OPTS="${OPTS:+$OPTS }--swap-file-path SWAP.swap"
 		OPTS="${OPTS:+$OPTS }--swap-file-size 100"