aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--debian/changelog12
-rwxr-xr-xpbuilder4
-rw-r--r--pbuilder-satisfydepends2
-rw-r--r--pbuilderrc.55
5 files changed, 25 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 68a00e9..cb4ecbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-11 Junichi Uekawa <dancer@debian.org>
+
+ * pbuilder-satisfydepends: quote echo INSTALLPKGMULTI
+
+ * pbuilder: apt-get clean after save_aptcache.
+
+ * pbuilderrc.5: document that EXTRAPACKAGES is a space-delimited list.
+
2006-01-30 Junichi Uekawa <dancer@debian.org>
* Makefile: install the script
diff --git a/debian/changelog b/debian/changelog
index d7e88e8..94745cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
pbuilder (0.147) UNRELEASED; urgency=low
- *
-
- -- Junichi Uekawa <dancer@debian.org> Tue, 31 Jan 2006 08:16:07 +0900
+ * Update pbuilderrc man page to specify EXTRAPACKAGES is space-delimited
+ (Closes: #352224).
+ * Bug fix: "sudo pbuilder login --save-after-login includes the apt
+ cache in the base.tgz", thanks to Andreas Beckmann (Closes: #351526).
+ * Bug fix: "pbuilder: Arch-specific
+ build-deps printed weird", thanks to Daniel Schepler (Closes:
+ #184149).
+
+ -- Junichi Uekawa <dancer@debian.org> Sat, 11 Feb 2006 22:15:21 +0900
pbuilder (0.146) unstable; urgency=low
diff --git a/pbuilder b/pbuilder
index 17cf9cf..0a6aa46 100755
--- a/pbuilder
+++ b/pbuilder
@@ -71,6 +71,8 @@ File extracted to: $BUILDPLACE
${CHROOTEXEC} bin/bash
save_aptcache
+ ${CHROOTEXEC} /usr/bin/apt-get clean
+
trap umountproc_cleanbuildplace exit
# saving the place afterwards
@@ -112,6 +114,8 @@ File extracted to: $BUILDPLACE
${CHROOTEXEC} /run "$@"
save_aptcache
+ ${CHROOTEXEC} /usr/bin/apt-get clean
+
trap umountproc_cleanbuildplace exit
# saving the place afterwards
diff --git a/pbuilder-satisfydepends b/pbuilder-satisfydepends
index 5da4315..74e72bb 100644
--- a/pbuilder-satisfydepends
+++ b/pbuilder-satisfydepends
@@ -84,7 +84,7 @@ tolower($0) ~ /^'"${BD_REGEXP}"':/ {p=1}
sed 's/^[^: ]*://' | \
tr " " "/" | \
awk 'BEGIN{RS=","} {print}'); do
- echo " -> Considering "$(echo $INSTALLPKGMULTI | tr "/" " " | awk '{print $0}' )
+ echo " -> Considering $(echo "$INSTALLPKGMULTI" | tr "/" " " | awk '{print $0}' )"
SATISFIED="no"
for INSTALLPKG in $(echo "$INSTALLPKGMULTI" | \
awk 'BEGIN{RS="|"} {print}'); do
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 5ce61b9..af105a3 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -1,4 +1,4 @@
-.TH "pbuilderrc" 5 "2002 Sep 25" "Debian" "pbuilder"
+.TH "pbuilderrc" 5 "2006 Feb 11" "Debian" "pbuilder"
.SH NAME
pbuilderrc \- configuration files for personal package builder
.SH DESCRIPTION
@@ -17,10 +17,11 @@ chroot image to be created and used.
This is overridden with the option
.BR "--basetgz" "."
.TP
-.BI "EXTRAPACKAGES=" "gcc3.0-athlon-builder"
+.BI "EXTRAPACKAGES=" """ccache linda XXX"""
Specifies extra packages which the system should install
in the chroot on
.BR "pbuilder create" "."
+This is a space-delimited list.
Also this is installed on
.B "pbuilder build"