fixed documentation, added changes to createbuildenv to chek for error state

when debootstrap/cdebootstrap does not exist.
Documentation update.

3 files changed, 17 insertions, 15 deletions

diff --git a/debian/TODO b/debian/TODO
index 3916dda..d3df72a 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,12 +1,5 @@
 TODO and possible bugs: 
 
-* /etc/mtab is now symlink to /proc/mounts
-   - document in pbuilder-doc.xml
-   - mount(1)
-mount(1) manual page states it will break "users" and make 'loop'
-   mount inconvenient.
-Check it out and document.
-
 * Need to test: amd64-x86 cross build with cowdancer 
 Need to test.
 
@@ -25,8 +18,6 @@ Cowdancer is not yet functional.
 * save-afer-login seems to save aptcache and make a big base.tgz.
    we don't want it, clean aptcache before save test it is functional.
 
-* select cdebootstrap if debootstrap does not exist and cdebootstrap exists.
-
 * revert back to using --variant=buildd for debootstrap
    - depends-on debian-bug: 314858 debootstrap: fixed in 0.3.2
 
diff --git a/debian/changelog b/debian/changelog
index c849512..6e9d76a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,24 @@
-pbuilder (0.137) UNRELEASED; urgency=low
+pbuilder (0.137) unstable; urgency=low
 
   [Junichi Uekawa]
-  * pbuilder-doc.xml: Document amd64-i386 usage in FAQ. (closes: #332737)
+  * pbuilder-doc.xml
+  - Document amd64-i386 usage in FAQ. (closes: #332737)
+  - typo fix
+  - document /etc/mtab inside chroot is a symbollic link.
+  
   * update TODO file.
+  
+  * allow debootstrap or cdebootstrap as dependency.
+  - check for debootstrap installation, and output meaningful error.
+    This is a follow-up to (#323843, #324648)
+    rationale: debootstrap has some more features and cdebootstrap, sometimes;
+    and cdebootstrap is not ported to all architectures.
+  
   [Matt Kraai]
   * If /proc is mounted, create a symbolic link from /etc/mtab to
     /proc/mounts.
 
- -- Junichi Uekawa <dancer@debian.org>  Fri, 28 Oct 2005 15:39:21 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Thu,  3 Nov 2005 10:06:58 +0900
 
 pbuilder (0.136) unstable; urgency=low
 
@@ -46,7 +57,7 @@ pbuilder (0.133) unstable; urgency=low
   * Change "exec" to "execute" in the description of the --save-after-exec
     option.
   [Junichi Uekawa]
-  * Change maintaners field to point to pbuilder-maint mailing list, and 
+  * Change maintainers field to point to pbuilder-maint mailing list, and 
     switch to using uploaders field.
 
  -- Junichi Uekawa <dancer@debian.org>  Sat,  1 Oct 2005 13:27:44 +0900
diff --git a/debian/control b/debian/control
index 4b0cdee..54bb49c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,9 @@ Standards-Version: 3.6.2
 
 Package: pbuilder
 Architecture: all
-Depends: cdebootstrap, wget, gcc, debianutils (>= 1.13.1), coreutils (>= 4.5.8-1)
+Depends: cdebootstrap|debootstrap, wget, gcc, debianutils (>= 1.13.1), coreutils (>= 4.5.8-1)
 Recommends: fakeroot, sudo, devscripts
-Suggests: pbuilder-uml, debootstrap
+Suggests: pbuilder-uml
 Description: personal package builder for Debian packages
  pbuilder constructs a chroot system, and builds a package inside the
  chroot.