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

Imported using git-ubuntu import.

Changelog parent: 7d39f42e93

New changelog entries:
  * make the click package installation check for proper architecture before
    trying to install packages from the list, so that i386 touch builds do not 
    fall over with "wrong architecture" failures at the click install step.

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.199) trusty; urgency=low
+
+  * make the click package installation check for proper architecture before
+    trying to install packages from the list, so that i386 touch builds do not 
+    fall over with "wrong architecture" failures at the click install step.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 26 Nov 2013 15:14:18 +0100
+
 livecd-rootfs (2.198) trusty; urgency=low
 
   * Double-quotes prevented the previous change from working, so drop those.

live-build/ubuntu-touch/hooks/60-install-click.chroot

@@ -15,11 +15,15 @@ tmpdir="$(mktemp -d)"
 cleanup () { rm -rf "$tmpdir"; }
 trap cleanup EXIT
 
+CLICKARCH=$(dpkg --print-architecture)
+
 wget --no-verbose -O "$tmpdir/click_list" "$click_list"
 for package in $(cat "$tmpdir/click_list")
 do
-    echo "Setting up $package"
+    if echo $package | egrep -q _$CLICKARCH.click|_all.click|_unknown.click; then
-    wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package"
+        echo "Setting up $package"
-    click install --force-missing-framework --root="$click_db" --all-users \
+        wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package"
-        "$tmpdir/$package"
+        click install --force-missing-framework --root="$click_db" --all-users \
+            "$tmpdir/$package"
+    fi
 done