From ffc787b4541788a10b1e7381c73b87d3427fc463 Mon Sep 17 00:00:00 2001
From: "Ying-Chun Liu (PaulLiu)" <paulliu@debian.org>
Date: Fri, 4 Aug 2023 04:42:15 +0800
Subject: [PATCH] Drop qemu-debootstrap

qemu-debootstrap is deprecated for a while. In newer qemu release
the command is totally removed. We can use debootstrap directly.

Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
---
 mk-sbuild     | 4 ++--
 pbuilder-dist | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk-sbuild b/mk-sbuild
index 076021c..9731362 100755
--- a/mk-sbuild
+++ b/mk-sbuild
@@ -754,8 +754,8 @@ if [ "$CHROOT_ARCH" != "$HOST_ARCH" ] ; then
         ;;
     # Sometimes we do
     *)
-        DEBOOTSTRAP_COMMAND=qemu-debootstrap
-        if ! which "$DEBOOTSTRAP_COMMAND"; then
+        DEBOOTSTRAP_COMMAND=debootstrap
+        if ! which "qemu-x86_64-static"; then
             sudo apt-get install qemu-user-static
         fi
         ;;
diff --git a/pbuilder-dist b/pbuilder-dist
index 27e94ce..799f6d6 100755
--- a/pbuilder-dist
+++ b/pbuilder-dist
@@ -492,7 +492,7 @@ def main():
             ("powerpc", "ppc64"),
             ("ppc64", "powerpc"),
         ]:
-            args += ["--debootstrap", "qemu-debootstrap"]
+            args += ["--debootstrap", "debootstrap"]
 
     if "mainonly" in sys.argv or "--main-only" in sys.argv:
         app.extra_components = False