+ * debian/README.Debian: update everything.

+
+	* pbuilderrc.5: update doc to mention --override-config
+
+	* pbuilder.8: update doc to mention that sid/sarge/woody are supported.
+	update doc to mention --override-config
+
+	* pbuilder-modules: update the help text a little bit.
+
+	* pbuilder-checkparams (OVERRIDE_APTLINES): new option --override-config
+	to install new aptlines.
+
+	* pbuilder-modules (extractbuildplace): Check that OVERRIDE_APTLINES is not set,
+	and rewrite apt lines.
+

6 files changed, 69 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index e90a266..e1e267c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2002-10-16  Junichi Uekawa  <dancer@debian.org>
 
+	* debian/README.Debian: update everything.
+
+	* pbuilderrc.5: update doc to mention --override-config
+
+	* pbuilder.8: update doc to mention that sid/sarge/woody are supported.
+	update doc to mention --override-config
+
+	* pbuilder-modules: update the help text a little bit.
+
+	* pbuilder-checkparams (OVERRIDE_APTLINES): new option --override-config
+	to install new aptlines.
+
+	* pbuilder-modules (extractbuildplace): Check that OVERRIDE_APTLINES is not set,
+	and rewrite apt lines.
+
 	* pbuilder-satisfydepends: apply patch from hmh, thanks!
 	It now searches for a version that matches.
 	Bug: #164919
diff --git a/debian/README.Debian b/debian/README.Debian
index bc9c552..db1609c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -8,7 +8,7 @@ Try:
 to create the initial chroot build environment.
 
   pbuilder update
-would update
+would update the tarball.
 
 
 pbuilder build some-random-.dsc 
@@ -21,12 +21,12 @@ of Debian packages, you may try invoking pdebuild from the Debian
 source directory, to save you from much typing.
 
 edit /etc/pbuilderrc if the default doesn't work, especially proxy.
-I would edit the mirror location too.
-Add non-us etc, at your option.
-
+Editing the mirror location is also recommended, although the default 
+should work fine.
 
 Please report to the Debian Bug Tracking System against pbuilder
-if a package does not build, and it seems like a genuine bug of pbuilder.
+if a package does not build, and it seems like a genuine bug of pbuilder 
+(i.e. you cannot work around the build failure in any way).
 Also, if something is missing and necessary on some arches, 
 please file a bug to "build-essential" for packages.
 
@@ -72,5 +72,13 @@ past.
 
 
 
+Further reading
+===============
+
+This documentation is not precise. I recommend reading
+pbuilder.8 and pbuilderrc.5 manual pages.
+
+
+
 $Id$
- -- Junichi Uekawa <dancer@debian.org>, Wed Oct 16 13:05:54 2002
+ -- Junichi Uekawa <dancer@debian.org>, Wed Oct 16 20:50:49 2002
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 9289af9..2ca336d 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -23,6 +23,7 @@
 #default value for this option is !empty!
 INTERNAL_BUILD_UML=""
 CHROOTEXEC=""
+OVERRIDE_APTLINES="no"
 
 while [ -n "$1" ]; do 
     case "$1" in 
@@ -118,6 +119,10 @@ while [ -n "$1" ]; do
 	--help)
 	    showhelp
 	    ;;
+	--override-config)
+	    OVERRIDE_APTLINES="yes"
+	    shift;
+	    ;;
 	--) # this is an empty option, to no longer process.
 	    shift; 
 	    break;
diff --git a/pbuilder-modules b/pbuilder-modules
index f2585b3..2114829 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -23,8 +23,8 @@ pbuilder - a personal builder
 Copyright 2001,2002 Junichi Uekawa
 Distributed under GNU Public License version 2 or later
 
-pbuilder [operation] [operation options]
-pdebuild [operation options]
+pbuilder [operation] [pbuilder-options]
+pdebuild [pbuilder-options]
 
 command lines:
 pbuilder create [--basetgz base.tgz-path] [--distribution woody|sid]
@@ -42,8 +42,7 @@ pbuilder clean
 pbuilder login
   Logs in to the build environment
 
-Operation Options:
-pbuilder options
+pbuilder-options:
  --basetgz [base.tgz location]
  --buildplace [location of build]
  --mirror [mirror location]
@@ -61,8 +60,9 @@ pbuilder options
  --logfile [filename to output log]
  --aptconfdir [overriding apt config dir]
  --timeout [timeout time]
+ --override-config 
 
-pdebuild options
+pdebuild-specific pbuilder-options
  --pbuilderroot [command to obtain root privilege for pbuilder] 
  --buildsourceroot [command to obtain root privilege for dpkg-buildpackage]
 EOF
@@ -207,7 +207,7 @@ function extractbuildplace () {
     mountproc
     mkdir -p "$BUILDPLACE/tmp/buildd"
     
-    if [ -n "$DISTRIBUTION" ]; then
+    if [ "$OVERRIDE_APTLINES" = "yes" ]; then
 	installaptlines
     fi
 }
diff --git a/pbuilder.8 b/pbuilder.8
index 6159369..cef5f5e 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -29,10 +29,12 @@ Updates the
 .B "base.tgz"
 for the specified distribution.
 Also, by specifying the 
-.B "--distribution"
-option, it is possible to switch the distribution.
-Specify a dummy distribution value 
-even for custom apt config files.
+.B "--override-config"
+option, it is possible to install a new apt-line using 
+the given options for the base.tgz.
+To switch the distribution, use the
+.B "--distribution" 
+option along with this.
 
 .TP
 .B "build"
@@ -144,8 +146,14 @@ should do.
 .BI "--distribution [" "distribution" "]"
 Specifies the distribution used. Currently the supported values are
 .B "sid"
+.B "sarge"
 and 
 .B "woody".
+
+The distribution switch only happens when 
+.B "--override-config" 
+option is set.
+
 .TP
 .BI "--removepackages [" "packages to remove" "]"
 Removes the packages on creating the 
@@ -163,7 +171,7 @@ surrounded in double quotations, like
 .BI "--extrapackages [" "packages to add" "]"
 Adds packages specified as an addition to the default,
 which is 
-.B build-essential
+.B "build-essential"
 by default.
 This is used in 
 .B "build"
@@ -178,7 +186,6 @@ The packages should be specified as a space-delimited list.
 .BI "--configfile [" "configuration file to load" "]"
 Loads the configuration file.
 
-
 \" START OF hookdir description
 
 .TP
@@ -279,6 +286,16 @@ Specify something like
 in the command line.
 Default is no timeout.
 
+
+.TP
+.BI "--override-config"
+
+Specify to use different apt set up inside the chroot than it was used for creating the 
+base.tgz.
+Specify this when you want to do pbuilder update with a different distribution
+target set up.
+
+
 .SH "FILES"
 .TP
 .I "/etc/pbuilderrc"
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 21ef6f5..274b5fa 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -114,18 +114,13 @@ be copied over to after the building.
 .TP
 .BI "DISTRIBUTION=" "woody"
 Specify the default distribution to use.
-This option affects 
-.B "create" 
-and 
-.B "update"
-but not 
-.B "build"
-nor 
-.B "login"
-
+This option only affects when doing
+.B "pbuilder create" 
+except for when 
+.B "--override-config"
+is specified for 
 .B "pbuilder update" 
-will update to this distribution, if this is specified,
-unless command line option is specified to override this.
+option.
 
 .TP
 .BI "APTCACHE=" "/var/cache/pbuilder/aptcache"