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

Imported using git-ubuntu import.

Changelog parent: 15d4db0238

New changelog entries:
  * Revert to always using archive-team.internal in 60-install-click.chroot
    for now.  This is unfortunate, but "hostname --fqdn" doesn't work at
    this stage.

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.184) saucy; urgency=low
+
+  * Revert to always using archive-team.internal in 60-install-click.chroot
+    for now.  This is unfortunate, but "hostname --fqdn" doesn't work at
+    this stage.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 06 Sep 2013 13:21:42 +0100
+
 livecd-rootfs (2.183) saucy; urgency=low
 
   * Make 60-install-click.chroot more verbose, in an attempt to figure out

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

@@ -1,17 +1,10 @@
 #!/bin/sh
 
-set -ex
+set -e
 
 echo "Setting up click packages"
 
-case $(hostname --fqdn) in
-	*.ubuntu.com|*.buildd)
-		click_uri=http://archive-team.internal/click_packages
-		;;
-	*)
-		click_uri=http://people.canonical.com/~ubuntu-archive/click_packages
-		;;
-esac
+click_uri=http://archive-team.internal/click_packages
 click_list=$click_uri/click_list
 click_db=/usr/share/click/preinstalled