[Junichi Uekawa]

  * Document that --debug option preserves build place.
    If the following fails, the build directory will remain intact:
    pbuilder create --distribution etch --basetgz a.tgz --debug
    (closes: #331635)
  * README.Debian, pbuilder-doc.xml: updated.

6 files changed, 94 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index fcda0c3..08ffb30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-08  Junichi Uekawa  <dancer@debian.org>
+
+	* Documentation/pbuilder-doc.xml: reviewed and updated documentation.
+	Added development, and bugreporting section, which should be 
+	filled up later, if possible.
+
+	* debian/README.Debian: update README
+
+	* pbuilder.8: refer to --debug option from --preserve-buildplace.
+
 2005-10-06  Junichi Uekawa  <dancer@debian.org>
 
 	* testsuite/run-test.sh (testbuild): add debootstrapopts, --verbose.
diff --git a/Documentation/pbuilder-doc.xml b/Documentation/pbuilder-doc.xml
index 5e77cd5..9901068 100644
--- a/Documentation/pbuilder-doc.xml
+++ b/Documentation/pbuilder-doc.xml
@@ -4,7 +4,7 @@
   and the latest version is found in CVS repository. -->
 <book>
   <bookinfo>
-    <date>2005-09-04</date>
+    <date>2005-10-08</date>
     <title>pbuilder User's Manual</title>
     <abbrev>pbuilder-doc</abbrev>
     <subtitle>Usage and operations</subtitle>
@@ -869,9 +869,8 @@ $ sudo pbuilder update --hookdir ~/loginhooks/E10shell
     <sect1 id="woodybackport">
       <title>pbuilder backported to stable Debian releases</title>
       <para>
-	It is known that Brian May does a backport of
-	pbuilder, available at:
-	<screen>deb http://www.microcomaustralia.com.au/debian/ woody main</screen>
+	Currently stable backport to sarge is not known to be available.
+	It should hopefully soon be available.
       </para>
     </sect1>
     <sect1 id="LOGNAME">
@@ -980,6 +979,11 @@ $ sudo pbuilder update --hookdir ~/loginhooks/E10shell
 	pbuilder-user-mode-linux is slower in executing the actual build system, due to the
 	usual user-mode-linux overhead for system calls. It is more friendly to the hard drive.
       </para>
+      <para>
+	pbuilder with cowdancer is under development, to allow
+	pbuilder to start up faster; when it is ready, it should 
+	be able to replace the current setup.
+      </para>
     </sect1>
     <sect1 id="chrootmemo">
       <title>Creating a chroot reminder</title>
@@ -1017,6 +1021,53 @@ $ sudo pbuilder update --hookdir ~/loginhooks/E10shell
     </sect1>
     <!-- end of FAQ -->
   </chapter>
+
+  <chapter id="develanddebug">
+    <title>Troubleshooting and development</title>
+    <sect1 id="bugreport">
+      <title>Reporting bugs </title>
+      <para>
+	To report bugs, it would be important to have a 
+	log of what's going wrong.
+	Most of the time, adding a --debug option and re-running the 
+	session should do the trick.
+	Please send the log of such session along with your problem
+	to ease the debugging process.
+      </para>
+    </sect1>
+    <sect1 id="mailinglist">
+      <title>Mailing list</title>
+      <para>
+	There is a mailing list for pbuilder on alioth (pbuilder-maint@lists.alioth.debian.org).
+	You can subscribe through the alioth web interface.
+	<ulink url="http://alioth.debian.org/mail/?group_id=30778">
+	  http://alioth.debian.org/mail/?group_id=30778</ulink>.
+      </para>
+    </sect1>
+    <sect1 id="development">
+      <title>Development</title>
+      <para>
+	This section is a start of what I want to do
+	later.
+      </para>
+      <para>
+	pbuilder is now co-maintained at alioth.
+	There is an alioth project page at
+	<ulink url="http://alioth.debian.org/projects/pbuilder">
+	http://alioth.debian.org/projects/pbuilder</ulink>.
+	CVS Repository is available through anonymous CVS
+      </para>
+      <screen>
+cvs -d:pserver:anonymous@cvs.alioth.debian.org:/cvsroot/pbuilder login
+cvs -z3 -d:pserver:anonymous@cvs.alioth.debian.org:/cvsroot/pbuilder co pbuilder
+      </screen>
+      <para>
+	Testsuites are available in tests/ directory, and 
+	changes are expected not to break the testsuites.
+      </para>
+    </sect1>
+  </chapter>
+
   <chapter id="otheruse">
     <title>Other uses of pbuilder</title>
     <sect1 id="chroot">
@@ -1325,6 +1376,8 @@ $ sudo pbuilder update --hookdir ~/loginhooks/E10shell
 	  for testing packages, and building packages in a pristine environment.
 	  There are other similar tools that do similar tasks, 
 	  but they do not share the exact same goal.
+	  To commemorate this fact, pbuilder is now co-maintained 
+	  with several people. 
 	</para>
       </sect2>
     </sect1>
diff --git a/debian/README.Debian b/debian/README.Debian
index 784cc78..4237f89 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -32,22 +32,23 @@ please file a bug to "build-essential" for packages.
 
 
 Testsuite:
-	The whole of Debian archive (main) is now being test-rebuilt with
-	pbuilder. Most packages succeed. Many fail to build from
-	source, genuinely, or from pbuilder bugs. The number of pbuilder
-	bugs are on the decreasing end. 6000 packages suceeded in building,
-	and about 600 packages don't build from source.
+	Regression test is done in testsuite/ directory of the 
+	pbuilder source package.
+
+	Most of the Debian archive seems to build with pbuilder;
+	keep up the good work.
 
 
 Further reading
 ===============
 
-This documentation is not precise. I recommend reading
+This documentation is very terse. I recommend reading
 pbuilder.8 and pbuilderrc.5 manual pages.
-There is also a HTML manual now, pbuilder-doc.html.
+There is also a HTML manual now, pbuilder-doc.html,
+which contains the FAQ and other entries.
 When they are incorrect or misleading, please send bugreports to the 
 Debian BTS.
 
 
 $Id$
- -- Junichi Uekawa <dancer@debian.org>, Mon Aug 25 07:18:42 2003
+ -- Junichi Uekawa <dancer@debian.org>, Sat Oct  8 17:10:48 2005
diff --git a/debian/changelog b/debian/changelog
index 894b882..8b37926 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-pbuilder (0.135) UNRELEASED; urgency=low
+pbuilder (0.135) unstable; urgency=low
 
   [Matt Kraai]
   * Don't add redundant group, passwd, and shadow entries for the build
     user.
+  
+  [Junichi Uekawa]
+  * Document that --debug option preserves build place.
+    If the following fails, the build directory will remain intact:
+    pbuilder create --distribution etch --basetgz a.tgz --debug
+    (closes: #331635)
+  * README.Debian, pbuilder-doc.xml: updated.
 
- -- Matt Kraai <kraai@debian.org>  Mon,  3 Oct 2005 06:52:07 -0700
+ -- Junichi Uekawa <dancer@debian.org>  Sat,  8 Oct 2005 17:23:32 +0900
 
 pbuilder (0.134) unstable; urgency=low
 
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 6485438..944d1c7 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -43,6 +43,7 @@ if [ ! -d "$BUILDPLACE" ]; then
     echo "pbuilder: Could not make directory [$BUILDPLACE]" >&2
     exit 1
 fi
+
 $TRAP cleanbuildplace exit
 
 echo " -> running $DEBOOTSTRAP"
diff --git a/pbuilder.8 b/pbuilder.8
index d6f9e62..1482a6b 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -434,6 +434,14 @@ if it has the same contents as the
 .B .tar.gz
 file, and no modifications are done.
 
+For preserving the build place for
+.B "create"
+and 
+.B "update"
+targets, see
+.B "--debug"
+option.
+
 As with
 .BR "\-\-no\-targz" ","
 suppresses appending