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

Imported using git-ubuntu import.

Changelog parent: ae76d5d754

New changelog entries:
  * Make livecd-rootfs be Architecture: any so that we can go back to the
    android-tools-fsutils dependency being architecture-specific, which
    relieves us of having to port it to new architectures which don't care
    about Android.

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (2.204) trusty; urgency=medium
+
+  * Make livecd-rootfs be Architecture: any so that we can go back to the
+    android-tools-fsutils dependency being architecture-specific, which
+    relieves us of having to port it to new architectures which don't care
+    about Android.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 31 Jan 2014 11:04:39 +0000
+
 livecd-rootfs (2.203) trusty; urgency=medium
 
   * Add hostname and machine-info to the writable paths, so that hostnamectl

debian/control

@@ -7,8 +7,8 @@ Standards-Version: 3.9.4
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
 
 Package: livecd-rootfs
-Architecture: all
-Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, e2fsprogs, germinate (>= 1.25.1), apt-utils, gnupg, live-build (>= 3.0~a55-1), android-tools-fsutils
+Architecture: any
+Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, e2fsprogs, germinate (>= 1.25.1), apt-utils, gnupg, live-build (>= 3.0~a55-1), android-tools-fsutils [armhf]
 Suggests: partimage
 Breaks: ubuntu-defaults-builder (<< 0.32)
 Description: construction script for the livecd rootfs