+2005-03-04 Junichi Uekawa <dancer@debian.org>

+
+	* pbuilder: apply patch frp, Danilo to save aptcache on pbuilder login.
+	Apply similar change to pbuilder execute.
+	271600
+
+	* pbuilder.8:
+	* pbuilder-checkparams:
+	* pbuilder-modules: support --aptcache option
+	thanks: Danilo Piazzalunga <danilopiazza@libero.it>
+	295766
+
+	* Cleaned build dir for pbuilder-uml #297100
+
+	* pbuilder-modules (pbuilder-options): document save-after-login/exec
+	flag in --help output. #296672
+

8 files changed, 63 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b22074f..c569eee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2005-03-04  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilder: apply patch frp, Danilo to save aptcache on pbuilder login.
+	Apply similar change to pbuilder execute.
+	271600
+
+	* pbuilder.8: 
+	* pbuilder-checkparams: 
+	* pbuilder-modules: support --aptcache option
+	thanks: Danilo Piazzalunga <danilopiazza@libero.it>
+	295766
+
+	* Cleaned build dir for pbuilder-uml #297100
+	
+	* pbuilder-modules (pbuilder-options): document save-after-login/exec
+	flag in --help output. #296672
+
 2005-02-13  Junichi Uekawa  <dancer@debian.org>
 
 	* pbuilder.8: update documentation to include 'sarge'
diff --git a/THANKS b/THANKS
index 39c13f0..50a3f11 100644
--- a/THANKS
+++ b/THANKS
@@ -37,6 +37,7 @@ Artur R. Czechowski
 Turbo Fredriksson <turbo@debian.org>
 Mike Markley <mike@markley.org>
 Era Eriksson <era@iki.fi>
+Danilo Piazzalunga <danilopiazza@libero.it>
 
 I thank them all!
 
diff --git a/debian/changelog b/debian/changelog
index 30abf73..650591f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pbuilder (0.123) unstable; urgency=low
+
+  * save aptcache on pbuilder login/exec. (closes: #271600)
+  * support --aptcache option. (closes: #295766)
+  * clean build directory for pbuilder-uml. (closes: #297100)
+  * document save-after-login/exec flags in pbuilder --help output. 
+    (closes: #296672)
+
+ -- Junichi Uekawa <dancer@debian.org>  Fri,  4 Mar 2005 13:34:51 +0900
+
 pbuilder (0.122) unstable; urgency=low
 
   * set umask 0022 (closes: #276589)
diff --git a/debian/rules b/debian/rules
index bfd7b65..99833c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,7 @@ clean:
 	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
 
+	rm -rf debian/pbuilder-uml/
 	dh_clean
 
 install: build
diff --git a/pbuilder b/pbuilder
index 1d74476..377d2fe 100755
--- a/pbuilder
+++ b/pbuilder
@@ -57,6 +57,9 @@ case "$1" in
 	extractbuildplace
 	trap umountproc_cleanbuildplace exit
 	loadhooks
+	recover_aptcache
+	trap saveaptcache_umountproc_cleanbuildplace exit
+
 	if [ "${INTERNAL_BUILD_UML}" = "yes" ]; then
 	    echo " -> entering the shell"
 	else
@@ -67,6 +70,9 @@ File extracted to: $BUILDPLACE
 	executehooks "F"
 	chroot "$BUILDPLACE" bin/bash
 
+	save_aptcache
+	trap umountproc_cleanbuildplace exit
+
 	# saving the place afterwards
 	if [ "${SAVE_AFTER_LOGIN}" = "yes" ]; then
 	    if [ "${INTERNAL_BUILD_UML}" = "yes" ]; then
@@ -96,12 +102,17 @@ File extracted to: $BUILDPLACE
 	trap umountproc_cleanbuildplace exit
 
 	loadhooks
+	recover_aptcache
+	trap saveaptcache_umountproc_cleanbuildplace exit
+
 	RUNNAME="$BUILDPLACE/run"
 	cat "$EXECPROGRAM" > "$RUNNAME"
 	chmod a+x "$RUNNAME"
 	executehooks "F"
 	chroot "$BUILDPLACE" /run "$@"
 
+	save_aptcache
+	trap umountproc_cleanbuildplace exit
 
 	# saving the place afterwards
 	if [ "${SAVE_AFTER_LOGIN}" = "yes" ]; then
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 2829c6e..33ffd24 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -92,6 +92,19 @@ while [ -n "$1" ]; do
 	    fi
 	    shift; shift;
 	    ;;
+	--aptcache)
+	    if [ -n "$2" ]; then
+		if [ -d "$2" ]; then
+		    APTCACHE=$(readlink -f "$2");
+		else
+		    echo "E: Directory $2 does not exist" >&2 
+		    exit 1
+		fi
+	    else
+		APTCACHE=
+	    fi
+	    shift; shift;
+	    ;;
 	--removepackages)
 	    REMOVEPACKAGES="$2";
 	    shift; shift;
diff --git a/pbuilder-modules b/pbuilder-modules
index 7747046..9a549af 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -55,6 +55,7 @@ pbuilder-options:
  --http-proxy [proxy]
  --distribution [distribution(potato/woody/sarge/sid)]
  --buildresult [location-to-copy-build-result]
+ --aptcache [location of retrieved package files]
  --removepackages [packages-to-remove on pbuilder create]
  --extrapackages [packages-to-add on pbuilder create]
  --configfile [configuration file to load]
@@ -71,6 +72,7 @@ pbuilder-options:
  --bindmounts [bind-mount-point]
  --debug
  --debootstrapopts [debootstrap options]
+ --save-after-login/--save-after-exec
 
 pdebuild-specific pbuilder-options:
  --pbuilderroot [command to obtain root privilege for pbuilder] 
diff --git a/pbuilder.8 b/pbuilder.8
index 2f54f16..9dafea2 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -192,6 +192,13 @@ is specified with
 option.
 
 .TP
+.BI "--aptcache [" "location of retrieved package files" "]"
+Specifies the location where the packages downloaded by apt should
+be cached. Use
+.B "--aptcache """""
+if you want caching to be turned off.
+
+.TP
 .BI "--removepackages [" "packages to remove" "]"
 Removes the packages on creating the 
 .BR "base.tgz" "."
@@ -308,7 +315,7 @@ target.
 
 Specifies that dpkg-buildpackage be called with
 .B "-m$DEBEMAIL"
-instead of default value specified in the environmental
+instead of default value specified in the environment
 variable, or pbuilderrc
 
 .B "This option is almost obsolete, use --debbuildopts instead"