change buildd variant the default

3 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 06e3f9a..309f9c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-22  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilderrc: default is now --variant=buildd for debootstrap option
+
 2007-01-20  Junichi Uekawa  <dancer@debian.org>
 
 	* pbuilder.8: add EXAMPLES section
diff --git a/debian/changelog b/debian/changelog
index 7a3e369..92862bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ pbuilder (0.163) UNRELEASED; urgency=low
     mounted, and breaks cowbuilder. (closes: #405497)
   * pbuilder repository moved over to git!
   * add EXAMPLES section in documentation.
+  * use --variant=buildd option for debootstrap and cdebootstrap chroot
+    building.
 
- -- Junichi Uekawa <dancer@debian.org>  Sat, 20 Jan 2007 13:36:14 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Mon, 22 Jan 2007 20:29:01 +0900
 
 pbuilder (0.162) unstable; urgency=low
 
diff --git a/pbuilderrc b/pbuilderrc
index 196a0c0..7ec5f45 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -57,8 +57,9 @@ BUILDUSERNAME=pbuilder
 BINDMOUNTS=""
 
 # Set the debootstrap variant to 'buildd' type.
-# DEBOOTSTRAPOPTS[0]='--variant=buildd'
-unset DEBOOTSTRAPOPTS
+DEBOOTSTRAPOPTS[0]='--variant=buildd'
+# or unset it to make it not a buildd type.
+# unset DEBOOTSTRAPOPTS
 
 # Set the PATH I am going to use inside pbuilder: default is "/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
 export PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"