+2004-10-09 Junichi Uekawa <dancer@debian.org>

+
+	* Documentation/pbuilder-doc.xml (PBUILDER_UML_IMAGE): documentation on
+	what directories cannot be bind-mounted
+	#275113
+
+	Added documentation on how to hook to pbuilder update.
+	somewhat addresses #275016, #272353
+
+	* debian/control (Depends): remove versioned depends on user-mode-linux. Packages are provided from other kernel packages.
+	#275544
+
+	* pbuilder: implement pbuilder debuild
+	#275110
+
+	* Documentation/pbuilder-doc.xml (PBUILDER_UML_IMAGE): update doc on
+	debian_chroot env var.
+	#275466
+
+

5 files changed, 80 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d9fe3e..8538a34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2004-10-09  Junichi Uekawa  <dancer@debian.org>
+
+	* Documentation/pbuilder-doc.xml (PBUILDER_UML_IMAGE): documentation on
+	what directories cannot be bind-mounted
+	#275113
+	
+	Added documentation on how to hook to pbuilder update.
+	somewhat addresses #275016, #272353
+	
+	* debian/control (Depends): remove versioned depends on user-mode-linux. Packages are provided from other kernel packages.
+	#275544
+
+	* pbuilder: implement pbuilder debuild
+	#275110
+
+	* Documentation/pbuilder-doc.xml (PBUILDER_UML_IMAGE): update doc on 
+	debian_chroot env var.
+	#275466
+	
+
 2004-09-13  Junichi Uekawa  <dancer@debian.org>
 
 	* pbuilder-modules (pbuilder-options): remove non-free and contrib from non-us.
diff --git a/Documentation/pbuilder-doc.xml b/Documentation/pbuilder-doc.xml
index 4625923..3469803 100644
--- a/Documentation/pbuilder-doc.xml
+++ b/Documentation/pbuilder-doc.xml
@@ -367,7 +367,7 @@
       <itemizedlist>
 	<listitem>
 	  <para>Automatic install-remove-upgrade-remove-install-purge-upgrade-purge testsuite (distributed as an example, <filename>B91dpkg-i</filename>), 
-	    or just check that everything installs somewhat (<filename>execute_installtest.sh</filename></para>
+	    or just check that everything installs somewhat (<filename>execute_installtest.sh</filename>)</para>
 	</listitem>
 
 	<listitem>
@@ -666,6 +666,34 @@ read
 	pbuilder does not provide a way to work around debootstrap.
       </para>
     </sect1>
+    <sect1 id="bindmountlimits">
+      <title>Directories that cannot be bind-mounted</title>
+      <para>
+	Because of the way pbuilder works, there are several directories 
+	that pbuilder will not function properly if they are bind-mounted.
+	The directories include <filename>/tmp</filename>,
+	<filename>/var/cache/pbuilder</filename>, 
+	and system directories such as <filename>/etc</filename> and
+	<filename>/usr</filename>.
+	The recommendation is to use directories from under user home directory
+	for bind-mounts.
+      </para>
+    </sect1>
+    <sect1 id="modifyupdate">
+      <title>Logging in to pbuilder to modify environment</title>
+      <para>
+	It is sometimes necessary to modify the chroot environment.
+	<command>login</command> will remove the contents of the chroot after logout.
+	It is possible to invoke shell using hook scripts.
+	<command>pbuilder update</command> executes 'E' scripts, and a sample for invoking shell
+	is provided as <filename>C10shell</filename>.
+      </para>
+      <screen>
+$ mkdir ~/loginhooks
+$ cp C10shell ~/loginhooks/E10shell
+$ sudo pbuilder update --hookdir ~/loginhooks/E10shell
+      </screen>
+    </sect1>
     <sect1 id="tmpdir">
       <title>Notes on usage of $TMPDIR</title>
       <para>
@@ -715,6 +743,20 @@ read
 	easier, it is possible to set environmental variables such as PS1
 	inside <filename>pbuilderrc</filename>
       </para>
+      <para>
+	With versions of bash more recent than 2.05b-2-15,
+	debian_chroot variable can be set to specify the name of 
+	chroot which is incorporated to create PS1.
+	On prior versions of bash<footnote>
+	  <para>Versions of bash from and before Debian 3.0</para>
+	</footnote>
+	it setting PS1 in pbuilderrc worked.
+      </para>
+      <para>example of debian_chroot</para>
+      <screen>
+	export debian_chroot="pbuild$$"
+      </screen>
+      <para>example os PS1</para>
       <screen>
 	export PS1="pbuild chroot 32165 # "
       </screen>
diff --git a/debian/changelog b/debian/changelog
index e89a7bb..2609d15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+pbuilder (0.116) unstable; urgency=low
+
+  * Maintenance update on pbuilder
+  * Fix bugs reported by madduck
+  * UML: versioned depends on user-mode-linux is removed, now depends on user-mode-linux so that packages with 'Provides:' can be used (closes: #275544)
+  * 'pbuilder debuild' is implemented  (closes: #275110)
+  * update docs on PS1 and 'debian_chroot' environmental variable introduced in newer bash package (closes: #275466) 
+  * Add notes on what cannot be bind-mounted (closes: #275113)
+  * hook to pbuilder update (closes: #275016, #272353)
+
+ -- Junichi Uekawa <dancer@debian.org>  Sat,  9 Oct 2004 09:22:30 +0900
+
 pbuilder (0.115) unstable; urgency=low
 
   * remove non-free and non-us from contrib. (closes: #271329)
diff --git a/debian/control b/debian/control
index d9861d9..96d2d67 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Description: personal package builder for Debian packages
 
 Package: pbuilder-uml
 Architecture: i386
-Depends: rootstrap (>= 0.3.9-1), user-mode-linux (>= 2.4.20-3um-1), pbuilder (= ${Source-Version})
+Depends: rootstrap (>= 0.3.9-1), user-mode-linux, pbuilder (= ${Source-Version})
 Description: user-mode-linux version of pbuilder
  pbuilder-uml uses a User-mode-linux system, and builds Debian packages
  inside the UML image. It is an ideal system to use to check 
diff --git a/pbuilder b/pbuilder
index 54cebb3..5fcfb3c 100755
--- a/pbuilder
+++ b/pbuilder
@@ -101,6 +101,10 @@ File extracted to: $BUILDPLACE
 	env;
 	echo " -> end dump config"
 	;;
+    debuild)
+	shift
+	"$0" execute "$@" /usr/lib/pbuilder/pdebuild-internal
+	;;
     *)
 	. /usr/lib/pbuilder/pbuilder-modules
 	showhelp