Import patches-unapplied version 2.206 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 34a87f0754

New changelog entries:
  * dropping maguro and adding flo, changing golfish to generic in touchsubarches

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.206) trusty; urgency=medium
+
+  * dropping maguro and adding flo, changing golfish to generic in touchsubarches
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Sat, 22 Feb 2014 23:35:07 +0100
+
 livecd-rootfs (2.205) trusty; urgency=medium
 
   * touch/48-setup-env.chroot: QML2_IMPORT_PATH should respect

live-build/auto/build

@@ -410,7 +410,7 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
 fi
 
 if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
-	touchsubarches="maguro manta grouper mako goldfish"
+	touchsubarches="flo manta grouper mako generic"
 
 	sourceslist="chroot/etc/apt/sources.list"