From 38fd3f47cb0a0317c8a924c2582213422b28d1bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <lool@dooz.org>
Date: Sun, 13 Dec 2009 15:01:09 +0100
Subject: Use debootstrap by default instead of cdebootstrap

---
 debian/NEWS          | 10 ++++++++--
 debian/control       |  2 +-
 pbuilder-checkparams |  2 +-
 pbuilder.8           |  6 +++---
 pbuilderrc           |  4 ++--
 pbuilderrc.5         |  2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index cba27e6..689c7f5 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,6 +1,12 @@
 pbuilder (0.195) unstable; urgency=low
 
-  --debbuildopts is now additive and will append to pbuilderrc's DEBBUILDOPTS.
-  To reset the list of options, pass --debbuildopts "".
+  * --debbuildopts is now additive and will append to pbuilderrc's
+    DEBBUILDOPTS.  To reset the list of options, pass --debbuildopts "".
+  * The default debootstrap command is now "debootstrap" instead of
+    "cdebootstrap"; cdebootstrap is still supported, but you might have to set
+    DEBOOTSTRAP="cdebootstrap" in your pbuilderrc or pass
+    --debootstrap=cdebootstrap to use it.  Custom cdebootstrap options set via
+    DEBOOTSTRAPOPTS or --debootstrapopts might not be compatible with
+    debootstrap.
 
  -- Loïc Minier <lool@dooz.org>  Sat, 12 Dec 2009 16:03:21 +0100
diff --git a/debian/control b/debian/control
index f4b5d5b..8388b34 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Vcs-Browser: http://git.debian.org/?p=pbuilder/pbuilder.git
 
 Package: pbuilder
 Architecture: all
-Depends: cdebootstrap | debootstrap,
+Depends: debootstrap | cdebootstrap,
          wget,
          debianutils (>= 1.13.1),
          coreutils (>= 4.5.8-1),
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index f8f02e8..6d24221 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -192,7 +192,7 @@ while [ -n "$1" ]; do
 	    shift; shift;
 	    ;;
 	--debootstrap)
-	    # Use this option to specify cdebootstrap
+	    # Use this option to specify debootstrap/cdebootstrap
 	    DEBOOTSTRAP="$2";
 	    shift; shift;
 	    ;;
diff --git a/pbuilder.8 b/pbuilder.8
index 3db2252..eefcd4d 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -360,14 +360,14 @@ option, for example:
 .B "--debootstrapopts --arch=arm --debootstrapopts --variant=buildd"
 
 .TP
-.BI "\-\-debootstrap " "cdebootstrap"
+.BI "\-\-debootstrap " "debootstrap"
 Use specified debootstrap implementation as debootstrap.
 Known implementations are
 .B cdebootstrap
 and
 .B debootstrap
-and default is to use 
-.B cdebootstrap.
+and default is to use
+.B debootstrap.
 
 .TP
 .BI "\-\-save\-after\-login "
diff --git a/pbuilderrc b/pbuilderrc
index 10d5fdf..77873d7 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -74,8 +74,8 @@ export PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
 # SHELL variable is used inside pbuilder by commands like 'su'; and they need sane values
 export SHELL=/bin/bash
 
-# The name of debootstrap command.
-DEBOOTSTRAP="cdebootstrap"
+# The name of debootstrap command, you might want "cdebootstrap".
+DEBOOTSTRAP="debootstrap"
 
 # default file extension for pkgname-logfile
 PKGNAME_LOGFILE_EXTENTION="_$(dpkg --print-architecture).build"
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 0983c4e..ad26ac9 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -188,7 +188,7 @@ buildd instead of trying to create a minimal installation chroot.
 is another directive in this file.
 
 .TP
-.BI "DEBOOTSTRAP=" "cdebootstrap"
+.BI "DEBOOTSTRAP=" "debootstrap"
 Use this option to switch the implementation of
 debootstrap.
 Known implementations of debootstrap are 
-- 
cgit v1.2.3