From f9570af63feb64513cb861de353383084875112b Mon Sep 17 00:00:00 2001
From: Emmet Hikory <persia@ubuntu.com>
Date: Tue, 9 Mar 2010 08:34:59 +0900
Subject: [PATCH] mk-sbuild: Really don't use build-arm-chroot

---
 debian/changelog | 5 ++++-
 mk-sbuild        | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f018631..c503485 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,10 @@ ubuntu-dev-tools (0.96) UNRELEASED; urgency=low
   [ Michael Bienia ]
   * ubuntu-build: missed updating a function call.
 
- -- Michael Bienia <geser@ubuntu.com>  Mon, 08 Mar 2010 17:49:49 +0100
+  [ Emmet Hikory ]
+  * mk-sbuild: Really don't use build-arm-chroot
+
+ -- Emmet Hikory <persia@ubuntu.com>  Tue, 09 Mar 2010 08:32:50 +0900
 
 ubuntu-dev-tools (0.95) lucid; urgency=low
 
diff --git a/mk-sbuild b/mk-sbuild
index bb98658..bba3f14 100755
--- a/mk-sbuild
+++ b/mk-sbuild
@@ -363,7 +363,7 @@ debian)
 esac
 
 DEBOOTSTRAP_COMMAND=debootstrap
-# Use qemu-kvm-extras-static / build-arm-chroot for foreign chroots
+# Use qemu-kvm-extras-static for foreign chroots
 if [ "$CHROOT_ARCH" != "$HOST_ARCH" ] ; then
     case "$CHROOT_ARCH-$HOST_ARCH" in
     # Sometimes we don't need qemu
@@ -371,10 +371,10 @@ if [ "$CHROOT_ARCH" != "$HOST_ARCH" ] ; then
         ;;
     # Sometimes we do
     *)
-        if [ ! -f "/usr/bin/build-arm-chroot" ]; then
+        DEBOOTSTRAP_COMMAND=qemu-debootstrap
+        if ! which "$DEBOOTSTRAP_COMMAND"; then
             sudo apt-get install qemu-kvm-extras-static
         fi
-        DEBOOTSTRAP_COMMAND=qemu-debootstrap
         ;;
     esac
 fi