release 0.150

author: dancer <dancer> 2006-03-20 14:33:26 +0000
committer: dancer <dancer> 2006-03-20 14:33:26 +0000
commit: b97db3ab387bd7f26c33f003d5ce142d5b4db111 (patch)
tree: ea5d31e383b03e13177edc98aa1e14bc8d5d9b82 /testsuite/normal
parent: 510aaa2fa7dcaac1d43179989398514343bdf3ca (diff)
download: pbuilder-b97db3ab387bd7f26c33f003d5ce142d5b4db111.tar
pbuilder-b97db3ab387bd7f26c33f003d5ce142d5b4db111.tar.gz
20 files changed, 704 insertions, 784 deletions
diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index 70a34dc..2feb9d0 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Mar 17 12:16:29 JST 2006
-pbuilder-time-stamp: 1142565389
+Current time: Mon Mar 20 12:15:52 JST 2006
+pbuilder-time-stamp: 1142824552
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/16168/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/25697/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -36,7 +36,7 @@ The following NEW packages will be installed:
 Need to get 0B/2901kB of archives.
 After unpacking 9617kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11257 files and directories currently installed.)
+(Reading database ... 11215 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -76,17 +76,17 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11855 files and directories currently installed.)
+(Reading database ... 11813 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/16168/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/16168/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/25697/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/25697/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -397,10 +397,10 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -412,7 +412,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Mar 17 03:17:15 UTC 2006
+Mon Mar 20 03:16:44 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -482,14 +482,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Mar 17 03:17:20 UTC 2006
+Mon Mar 20 03:16:49 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
-c: c
 b: b
+c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -612,7 +612,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Fri Mar 17 12:17:22 JST 2006
-pbuilder-time-stamp: 1142565442
+Current time: Mon Mar 20 12:16:52 JST 2006
+pbuilder-time-stamp: 1142824612
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/16168 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/25697 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sarge.log b/testsuite/normal/pbuilder-build-dsh-sarge.log
index 594eb63..1a4638e 100644
--- a/testsuite/normal/pbuilder-build-dsh-sarge.log
+++ b/testsuite/normal/pbuilder-build-dsh-sarge.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Mar 17 12:08:17 JST 2006
-pbuilder-time-stamp: 1142564897
+Current time: Mon Mar 20 12:07:47 JST 2006
+pbuilder-time-stamp: 1142824067
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/11946/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/21704/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -86,12 +86,12 @@ Unpacking fakeroot (from .../fakeroot_1.2.10_amd64.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/11946/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/11946/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/21704/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/21704/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -394,9 +394,9 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -409,7 +409,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Mar 17 03:09:00 UTC 2006
+Mon Mar 20 03:08:24 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -479,14 +479,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Mar 17 03:09:05 UTC 2006
+Mon Mar 20 03:08:29 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-dsh: Process terminated (before write).
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -592,7 +592,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Fri Mar 17 12:09:07 JST 2006
-pbuilder-time-stamp: 1142564947
+Current time: Mon Mar 20 12:08:31 JST 2006
+pbuilder-time-stamp: 1142824111
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/11946 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/21704 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index 652ed0c..539127e 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Mar 17 12:02:30 JST 2006
-pbuilder-time-stamp: 1142564550
+Current time: Mon Mar 20 12:02:18 JST 2006
+pbuilder-time-stamp: 1142823738
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/14299/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/24132/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -33,13 +33,10 @@ The following NEW packages will be installed:
   debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
-Need to get 308kB/2917kB of archives.
-After unpacking 9708kB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org sid/main libmagic1 4.17-1 [277kB]
-Get:2 http://ftp.jp.debian.org sid/main file 4.17-1 [31.4kB]
-Fetched 308kB in 0s (795kB/s)
+Need to get 0B/2910kB of archives.
+After unpacking 9699kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11244 files and directories currently installed.)
+(Reading database ... 11245 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -48,11 +45,11 @@ Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
 Unpacking gettext (from .../gettext_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package intltool-debian.
-Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
+Unpacking intltool-debian (from .../intltool-debian_0.34.1+20060220_all.deb) ...
 Selecting previously deselected package po-debconf.
-Unpacking po-debconf (from .../po-debconf_0.9.2_all.deb) ...
+Unpacking po-debconf (from .../po-debconf_1.0_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.24_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.25_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -64,9 +61,9 @@ Setting up html2text (1.3.2a-3) ...
 
 Setting up gettext (0.14.5-2) ...
 
-Setting up intltool-debian (0.34.1+20050828) ...
-Setting up po-debconf (0.9.2) ...
-Setting up debhelper (5.0.24) ...
+Setting up intltool-debian (0.34.1+20060220) ...
+Setting up po-debconf (1.0) ...
+Setting up debhelper (5.0.25) ...
 Setting up libdshconfig1 (0.20.12-1) ...
 
 Setting up libdshconfig1-dev (0.20.12-1) ...
@@ -76,22 +73,20 @@ Building dependency tree...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/97.9kB of archives.
-After unpacking 406kB of additional disk space will be used.
+Need to get 0B/96.2kB of archives.
+After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11842 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
-Setting up fakeroot (1.5.7) ...
+(Reading database ... 11839 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
+Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
- -> new cache content libmagic1_4.17-1_amd64.deb added
- -> new cache content file_4.17-1_amd64.deb added
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/14299/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/14299/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/24132/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/24132/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -417,7 +412,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Mar 17 03:03:33 UTC 2006
+Mon Mar 20 03:03:15 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -487,7 +482,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Mar 17 03:03:38 UTC 2006
+Mon Mar 20 03:03:20 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -617,7 +612,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Fri Mar 17 12:03:42 JST 2006
-pbuilder-time-stamp: 1142564622
+Current time: Mon Mar 20 12:03:27 JST 2006
+pbuilder-time-stamp: 1142823807
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir1/14299 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir1/24132 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index 9264a46..0f4e7d6 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -561,17 +561,17 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//8096/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//17629/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//8096/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//17629/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org etch Release.gpg [189B]
 Hit http://ftp.jp.debian.org etch Release
 Hit http://ftp.jp.debian.org etch/main Packages
-Fetched 189B in 0s (2473B/s)
+Fetched 189B in 0s (2573B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -587,7 +587,7 @@ The following extra packages will be installed:
 Suggested packages:
   binutils-doc cpp-doc gcc-4.0-locales debian-keyring gcc-4.0-doc lib32stdc++6
   manpages-dev autoconf automake1.9 libtool flex bison gdb gcc-doc
-  ia32-libs-dev lib32gcc1 glibc-doc libstdc++6-4.0-doc stl-manual diff-doc
+  libc6-dev-i386 lib32gcc1 glibc-doc libstdc++6-4.0-doc stl-manual diff-doc
   libterm-readline-gnu-perl libterm-readline-perl-perl
 Recommended packages:
   bzip2 libmudflap0-dev perl-doc
@@ -596,13 +596,13 @@ The following NEW packages will be installed:
   libc6-dev libdb4.4 libstdc++6-4.0-dev linux-kernel-headers make patch perl
   perl-modules
 0 upgraded, 17 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/21.2MB of archives.
-After unpacking 84.1MB of additional disk space will be used.
+Need to get 0B/21.0MB of archives.
+After unpacking 83.1MB of additional disk space will be used.
 Selecting previously deselected package binutils.
-(Reading database ... 6872 files and directories currently installed.)
+(Reading database ... 6850 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20060117-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
-Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-9_amd64.deb) ...
+Unpacking cpp-4.0 (from .../cpp-4.0_4.0.3-1_amd64.deb) ...
 Selecting previously deselected package cpp.
 Unpacking cpp (from .../cpp_4%3a4.0.2-2_amd64.deb) ...
 Selecting previously deselected package perl-modules.
@@ -618,43 +618,44 @@ Unpacking make (from .../make_3.80+3.81.b4-1_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
 Unpacking dpkg-dev (from .../dpkg-dev_1.13.16_all.deb) ...
 Selecting previously deselected package gcc-4.0.
-Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-9_amd64.deb) ...
+Unpacking gcc-4.0 (from .../gcc-4.0_4.0.3-1_amd64.deb) ...
 Selecting previously deselected package gcc.
 Unpacking gcc (from .../gcc_4%3a4.0.2-2_amd64.deb) ...
 Selecting previously deselected package linux-kernel-headers.
 Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
-Unpacking libc6-dev (from .../libc6-dev_2.3.5-13_amd64.deb) ...
+Unpacking libc6-dev (from .../libc6-dev_2.3.6-3_amd64.deb) ...
 Selecting previously deselected package libstdc++6-4.0-dev.
-Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-9_amd64.deb) ...
+Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.3-1_amd64.deb) ...
 Selecting previously deselected package g++-4.0.
-Unpacking g++-4.0 (from .../g++-4.0_4.0.2-9_amd64.deb) ...
+Unpacking g++-4.0 (from .../g++-4.0_4.0.3-1_amd64.deb) ...
 Selecting previously deselected package g++.
 Unpacking g++ (from .../g++_4%3a4.0.2-2_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.2_amd64.deb) ...
 Setting up binutils (2.16.1cvs20060117-1) ...
 
-Setting up cpp-4.0 (4.0.2-9) ...
+Setting up cpp-4.0 (4.0.3-1) ...
 Setting up cpp (4.0.2-2) ...
 
 Setting up libdb4.4 (4.4.20-3) ...
 Setting up patch (2.5.9-4) ...
 Setting up make (3.80+3.81.b4-1) ...
 
-Setting up gcc-4.0 (4.0.2-9) ...
+Setting up gcc-4.0 (4.0.3-1) ...
 Setting up gcc (4.0.2-2) ...
 
 Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
-Setting up libc6-dev (2.3.5-13) ...
+Setting up libc6-dev (2.3.6-3) ...
 Setting up perl-modules (5.8.8-2) ...
-Setting up libstdc++6-4.0-dev (4.0.2-9) ...
-Setting up perl (5.8.8-2) ...
+Setting up g++-4.0 (4.0.3-1) ...
+Setting up libstdc++6-4.0-dev (4.0.3-1) ...
 
-Setting up dpkg-dev (1.13.16) ...
-Setting up g++-4.0 (4.0.2-9) ...
 Setting up g++ (4.0.2-2) ...
 
+Setting up perl (5.8.8-2) ...
+
+Setting up dpkg-dev (1.13.16) ...
 Setting up build-essential (11.2) ...
 Copying back the cached apt archive contents
 umount: /sys: not mounted
@@ -663,9 +664,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//8096/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//17629/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//8096 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//17629 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sarge.log b/testsuite/normal/pbuilder-create-sarge.log
index 2f1e0c7..b82e084 100644
--- a/testsuite/normal/pbuilder-create-sarge.log
+++ b/testsuite/normal/pbuilder-create-sarge.log
@@ -330,16 +330,16 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//3039/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//12913/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//3039/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//12913/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Hit http://ftp.jp.debian.org sarge/main Packages
 Get:1 http://ftp.jp.debian.org sarge/main Release [110B]
-Fetched 110B in 0s (2124B/s)
+Fetched 110B in 0s (1436B/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -426,9 +426,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] [pid | job]... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//3039/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//12913/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//3039 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12913 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index 703b3ee..c3fbe2a 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -561,17 +561,17 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//6199/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//16071/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//6199/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//16071/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 189B in 0s (1481B/s)
+Fetched 189B in 0s (3090B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -596,18 +596,10 @@ The following NEW packages will be installed:
   libc6-dev libdb4.4 libstdc++6-4.0-dev linux-kernel-headers make patch perl
   perl-modules
 0 upgraded, 17 newly installed, 0 to remove and 0 not upgraded.
-Need to get 15.1MB/21.1MB of archives.
+Need to get 0B/21.1MB of archives.
 After unpacking 83.2MB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org sid/main cpp-4.0 4.0.3-1 [2260kB]
-Get:2 http://ftp.jp.debian.org sid/main perl-modules 5.8.8-3 [2319kB]
-Get:3 http://ftp.jp.debian.org sid/main perl 5.8.8-3 [4254kB]
-Get:4 http://ftp.jp.debian.org sid/main gcc-4.0 4.0.3-1 [530kB]
-Get:5 http://ftp.jp.debian.org sid/main linux-kernel-headers 2.6.13+0rc3-2.1 [1686kB]
-Get:6 http://ftp.jp.debian.org sid/main libstdc++6-4.0-dev 4.0.3-1 [1486kB]
-Get:7 http://ftp.jp.debian.org sid/main g++-4.0 4.0.3-1 [2585kB]
-Fetched 15.1MB in 10s (1472kB/s)
 Selecting previously deselected package binutils.
-(Reading database ... 6878 files and directories currently installed.)
+(Reading database ... 6879 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20060117-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.3-1_amd64.deb) ...
@@ -616,7 +608,7 @@ Unpacking cpp (from .../cpp_4%3a4.0.2-2_amd64.deb) ...
 Selecting previously deselected package perl-modules.
 Unpacking perl-modules (from .../perl-modules_5.8.8-3_all.deb) ...
 Selecting previously deselected package libdb4.4.
-Unpacking libdb4.4 (from .../libdb4.4_4.4.20-3_amd64.deb) ...
+Unpacking libdb4.4 (from .../libdb4.4_4.4.20-4_amd64.deb) ...
 Selecting previously deselected package perl.
 Unpacking perl (from .../perl_5.8.8-3_amd64.deb) ...
 Selecting previously deselected package patch.
@@ -646,7 +638,7 @@ Setting up binutils (2.16.1cvs20060117-1) ...
 Setting up cpp-4.0 (4.0.3-1) ...
 Setting up cpp (4.0.2-2) ...
 
-Setting up libdb4.4 (4.4.20-3) ...
+Setting up libdb4.4 (4.4.20-4) ...
 Setting up patch (2.5.9-4) ...
 Setting up make (3.80+3.81.rc1-1) ...
 
@@ -666,41 +658,16 @@ Setting up perl (5.8.8-3) ...
 Setting up dpkg-dev (1.13.16) ...
 Setting up build-essential (11.2) ...
 Copying back the cached apt archive contents
- -> new cache content cpio_2.6-11_amd64.deb added
- -> new cache content debconf_1.4.72_all.deb added
- -> new cache content debconf-i18n_1.4.72_all.deb added
- -> new cache content gcc-4.0-base_4.0.3-1_amd64.deb added
- -> new cache content gnupg_1.4.2.2-1_amd64.deb added
- -> new cache content info_4.8-7_amd64.deb added
- -> new cache content libgcc1_1%3a4.0.3-1_amd64.deb added
- -> new cache content libslang2_2.0.6-2_amd64.deb added
- -> new cache content libssl0.9.8_0.9.8a-8_amd64.deb added
- -> new cache content libstdc++6_4.0.3-1_amd64.deb added
- -> new cache content libusb-0.1-4_2%3a0.1.11-6_amd64.deb added
- -> new cache content login_1%3a4.0.14-9_amd64.deb added
- -> new cache content lsb-base_3.0-16_all.deb added
- -> new cache content manpages_2.22-1_all.deb added
- -> new cache content modutils_2.4.27.0-5_amd64.deb added
- -> new cache content netcat_1.10-31_amd64.deb added
- -> new cache content passwd_1%3a4.0.14-9_amd64.deb added
- -> new cache content perl-base_5.8.8-3_amd64.deb added
- -> new cache content zlib1g_1%3a1.2.3-11_amd64.deb added
- -> new cache content cpp-4.0_4.0.3-1_amd64.deb added
- -> new cache content perl-modules_5.8.8-3_all.deb added
- -> new cache content perl_5.8.8-3_amd64.deb added
- -> new cache content gcc-4.0_4.0.3-1_amd64.deb added
- -> new cache content linux-kernel-headers_2.6.13+0rc3-2.1_amd64.deb added
- -> new cache content libstdc++6-4.0-dev_4.0.3-1_amd64.deb added
- -> new cache content g++-4.0_4.0.3-1_amd64.deb added
+ -> new cache content tar_1.15.1-6_amd64.deb added
 umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//6199/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//16071/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//6199 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16071 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-etch.log b/testsuite/normal/pbuilder-execute-etch.log
index 0e0c988..3840cde 100644
--- a/testsuite/normal/pbuilder-execute-etch.log
+++ b/testsuite/normal/pbuilder-execute-etch.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//4181/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//13700/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//4181 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//13700 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sarge.log b/testsuite/normal/pbuilder-execute-sarge.log
index 9e0ad5c..e7d71f3 100644
--- a/testsuite/normal/pbuilder-execute-sarge.log
+++ b/testsuite/normal/pbuilder-execute-sarge.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//32283/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//9649/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//32283 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//9649 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sid.log b/testsuite/normal/pbuilder-execute-sid.log
index 41fc451..71591b9 100644
--- a/testsuite/normal/pbuilder-execute-sid.log
+++ b/testsuite/normal/pbuilder-execute-sid.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//2162/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//12050/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//2162 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12050 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
index 2690f08..7e1664e 100644
--- a/testsuite/normal/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//6851/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//16171/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -16,8 +16,8 @@ Get:2 http://ftp.jp.debian.org experimental Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org experimental Release [4245B]
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:4 http://ftp.jp.debian.org experimental/main Packages [142kB]
-Fetched 146kB in 0s (611kB/s)
+Get:4 http://ftp.jp.debian.org experimental/main Packages [147kB]
+Fetched 151kB in 0s (435kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -106,9 +106,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//6851/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//16171/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//6851 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16171 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index 50c4b5a..1e68703 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//5085/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//14575/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -12,114 +12,88 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [5902B]
-Get:3 http://ftp.jp.debian.org sid/main Packages [3950kB]
-Fetched 3956kB in 2s (1960kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3979kB]
+Fetched 3985kB in 1s (2096kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
 Reading package lists...
 Building dependency tree...
 The following packages will be upgraded:
-  base-files bash bsdutils coreutils cpio cpp-4.0 debconf debconf-i18n g++-4.0
-  gcc-4.0 gcc-4.0-base info klogd libattr1 libc6 libc6-dev libgcc1 libslang2
-  libssl0.9.8 libstdc++6 libstdc++6-4.0-dev libusb-0.1-4 linux-kernel-headers
-  login lsb-base make modutils mount netcat passwd perl perl-base perl-modules
-  sysklogd sysv-rc util-linux zlib1g
-37 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 47.6kB/32.3MB of archives.
-After unpacking 205kB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org sid/main sysv-rc 2.86.ds1-13 [47.6kB]
-Fetched 47.6kB in 0s (534kB/s)
-(Reading database ... 11257 files and directories currently installed.)
-Preparing to replace base-files 3.1.10 (using .../base-files_3.1.11_amd64.deb) ...
-Unpacking replacement base-files ...
-Setting up base-files (3.1.11) ...
-
-(Reading database ... 11258 files and directories currently installed.)
+  bash bsdutils coreutils cpio debconf debconf-i18n info initscripts klogd
+  libattr1 libdb4.2 libdb4.3 libdb4.4 libslang2 libssl0.9.8 libusb-0.1-4
+  linux-kernel-headers lsb-base make modutils mount netcat perl perl-base
+  perl-modules sysklogd sysv-rc sysvinit tar util-linux zlib1g
+31 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/19.0MB of archives.
+After unpacking 1249kB of additional disk space will be used.
+(Reading database ... 11215 files and directories currently installed.)
 Preparing to replace bash 3.1-2 (using .../archives/bash_3.1-3_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.1-3) ...
 Installing new version of config file /etc/bash_completion ...
 Installing new version of config file /etc/skel/.bashrc ...
 
-(Reading database ... 11263 files and directories currently installed.)
+(Reading database ... 11220 files and directories currently installed.)
 Preparing to replace bsdutils 1:2.12r-6 (using .../bsdutils_1%3a2.12r-8_amd64.deb) ...
 Unpacking replacement bsdutils ...
 Setting up bsdutils (2.12r-8) ...
 
-(Reading database ... 11263 files and directories currently installed.)
+(Reading database ... 11220 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.94-1_amd64.deb) ...
 Removing `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 No diversion `any diversion of /usr/bin/md5sum.textutils', none removed
 Unpacking replacement coreutils ...
 Setting up coreutils (5.94-1) ...
 
-(Reading database ... 11284 files and directories currently installed.)
-Preparing to replace login 1:4.0.14-7 (using .../login_1%3a4.0.14-9_amd64.deb) ...
-Unpacking replacement login ...
-Setting up login (4.0.14-9) ...
-
-(Reading database ... 11284 files and directories currently installed.)
+(Reading database ... 11241 files and directories currently installed.)
 Preparing to replace mount 2.12r-6 (using .../mount_2.12r-8_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.12r-8) ...
 
-(Reading database ... 11284 files and directories currently installed.)
+(Reading database ... 11241 files and directories currently installed.)
 Preparing to replace perl-modules 5.8.8-2 (using .../perl-modules_5.8.8-3_all.deb) ...
 Unpacking replacement perl-modules ...
-Preparing to replace linux-kernel-headers 2.6.13+0rc3-2 (using .../linux-kernel-headers_2.6.13+0rc3-2.1_amd64.deb) ...
-Unpacking replacement linux-kernel-headers ...
-Preparing to replace libc6-dev 2.3.5-13 (using .../libc6-dev_2.3.6-3_amd64.deb) ...
-Unpacking replacement libc6-dev ...
-Preparing to replace libc6 2.3.5-13 (using .../libc6_2.3.6-3_amd64.deb) ...
-Unpacking replacement libc6 ...
-Setting up libc6 (2.3.6-3) ...
-Installing new version of config file /etc/init.d/glibc.sh ...
-Current default timezone: 'UTC'.
-Local time is now:      Fri Mar 17 03:20:03 UTC 2006.
-Universal Time is now:  Fri Mar 17 03:20:03 UTC 2006.
-Run 'tzconfig' if you wish to change it.
-
-(Reading database ... 11262 files and directories currently installed.)
+Preparing to replace libdb4.4 4.4.20-3 (using .../libdb4.4_4.4.20-4_amd64.deb) ...
+Unpacking replacement libdb4.4 ...
 Preparing to replace perl 5.8.8-2 (using .../perl_5.8.8-3_amd64.deb) ...
 Unpacking replacement perl ...
 Preparing to replace perl-base 5.8.8-2 (using .../perl-base_5.8.8-3_amd64.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.8-3) ...
-(Reading database ... 11262 files and directories currently installed.)
+(Reading database ... 11241 files and directories currently installed.)
+Preparing to replace sysvinit 2.86.ds1-12 (using .../sysvinit_2.86.ds1-13_amd64.deb) ...
+Unpacking replacement sysvinit ...
+Setting up sysvinit (2.86.ds1-13) ...
+init: timeout opening/writing control channel /dev/initctl
+
+(Reading database ... 11242 files and directories currently installed.)
+Preparing to replace tar 1.15.1-4 (using .../tar_1.15.1-6_amd64.deb) ...
+Unpacking replacement tar ...
+Setting up tar (1.15.1-6) ...
+
+(Reading database ... 11242 files and directories currently installed.)
 Preparing to replace lsb-base 3.0-15 (using .../lsb-base_3.0-16_all.deb) ...
 Unpacking replacement lsb-base ...
 Setting up lsb-base (3.0-16) ...
-(Reading database ... 11262 files and directories currently installed.)
+(Reading database ... 11242 files and directories currently installed.)
 Preparing to replace util-linux 2.12r-6 (using .../util-linux_2.12r-8_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12r-8) ...
 
-(Reading database ... 11262 files and directories currently installed.)
+(Reading database ... 11242 files and directories currently installed.)
 Preparing to replace debconf-i18n 1.4.71 (using .../debconf-i18n_1.4.72_all.deb) ...
 Unpacking replacement debconf-i18n ...
 Preparing to replace debconf 1.4.71 (using .../debconf_1.4.72_all.deb) ...
 Unpacking replacement debconf ...
-Preparing to replace cpp-4.0 4.0.2-9 (using .../cpp-4.0_4.0.3-1_amd64.deb) ...
-Unpacking replacement cpp-4.0 ...
-Preparing to replace gcc-4.0-base 4.0.2-9 (using .../gcc-4.0-base_4.0.3-1_amd64.deb) ...
-Unpacking replacement gcc-4.0-base ...
-Preparing to replace libgcc1 1:4.0.2-9 (using .../libgcc1_1%3a4.0.3-1_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up gcc-4.0-base (4.0.3-1) ...
-
-Setting up libgcc1 (4.0.3-1) ...
-
-(Reading database ... 11264 files and directories currently installed.)
-Preparing to replace gcc-4.0 4.0.2-9 (using .../gcc-4.0_4.0.3-1_amd64.deb) ...
-Unpacking replacement gcc-4.0 ...
-Preparing to replace g++-4.0 4.0.2-9 (using .../g++-4.0_4.0.3-1_amd64.deb) ...
-Unpacking replacement g++-4.0 ...
-Preparing to replace libstdc++6-4.0-dev 4.0.2-9 (using .../libstdc++6-4.0-dev_4.0.3-1_amd64.deb) ...
-Unpacking replacement libstdc++6-4.0-dev ...
-Preparing to replace libstdc++6 4.0.2-9 (using .../libstdc++6_4.0.3-1_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.0.3-1) ...
+Preparing to replace initscripts 2.86.ds1-12 (using .../initscripts_2.86.ds1-13_amd64.deb) ...
+Unpacking replacement initscripts ...
+Setting up initscripts (2.86.ds1-13) ...
+Installing new version of config file /etc/init.d/hostname.sh ...
+Installing new version of config file /etc/init.d/mountall.sh ...
+Installing new version of config file /etc/init.d/mountnfs.sh ...
+Installing new version of config file /etc/init.d/umountfs ...
+Installing new version of config file /etc/init.d/umountroot ...
 
 (Reading database ... 11244 files and directories currently installed.)
 Preparing to replace libslang2 2.0.5-3 (using .../libslang2_2.0.6-2_amd64.deb) ...
@@ -155,14 +129,15 @@ Preparing to replace netcat 1.10-30 (using .../netcat_1.10-31_amd64.deb) ...
 Unpacking replacement netcat ...
 Preparing to replace libattr1 2.4.25-1 (using .../libattr1_2.4.31-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
-Preparing to replace passwd 1:4.0.14-7 (using .../passwd_1%3a4.0.14-9_amd64.deb) ...
-Unpacking replacement passwd ...
+Preparing to replace libdb4.3 4.3.29-4.1 (using .../libdb4.3_4.3.29-5_amd64.deb) ...
+Unpacking replacement libdb4.3 ...
+Preparing to replace linux-kernel-headers 2.6.13+0rc3-2 (using .../linux-kernel-headers_2.6.13+0rc3-2.1_amd64.deb) ...
+Unpacking replacement linux-kernel-headers ...
 Preparing to replace make 3.80+3.81.b4-1 (using .../make_3.80+3.81.rc1-1_amd64.deb) ...
 Unpacking replacement make ...
-Setting up linux-kernel-headers (2.6.13+0rc3-2.1) ...
-Setting up libc6-dev (2.3.6-3) ...
-Setting up cpp-4.0 (4.0.3-1) ...
-Setting up gcc-4.0 (4.0.3-1) ...
+Preparing to replace libdb4.2 4.2.52-23.1 (using .../libdb4.2_4.2.52-24_amd64.deb) ...
+Unpacking replacement libdb4.2 ...
+Setting up libdb4.4 (4.4.20-4) ...
 Setting up cpio (2.6-11) ...
 
 Setting up info (4.8-7) ...
@@ -175,12 +150,12 @@ Architecture-specific modutils configuration for x86_64 not found, using default
 Setting up netcat (1.10-31) ...
 Setting up libattr1 (2.4.31-1) ...
 
-Setting up passwd (4.0.14-9) ...
-
+Setting up libdb4.3 (4.3.29-5) ...
+Setting up linux-kernel-headers (2.6.13+0rc3-2.1) ...
 Setting up make (3.80+3.81.rc1-1) ...
 
+Setting up libdb4.2 (4.2.52-24) ...
 Setting up debconf-i18n (1.4.72) ...
-Setting up g++-4.0 (4.0.3-1) ...
 Setting up klogd (1.4.1-17.1) ...
 Installing new version of config file /etc/init.d/klogd ...
 Stopping kernel log daemon: klogd.
@@ -190,8 +165,6 @@ Setting up sysklogd (1.4.1-17.1) ...
 Setting up perl-modules (5.8.8-3) ...
 Setting up debconf (1.4.72) ...
 
-Setting up libstdc++6-4.0-dev (4.0.3-1) ...
-
 Setting up libssl0.9.8 (0.9.8a-8) ...
 
 Setting up perl (5.8.8-3) ...
@@ -203,16 +176,15 @@ dpkg-dev is already the newest version.
 apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Copying back the cached apt archive contents
- -> new cache content sysv-rc_2.86.ds1-13_all.deb added
 umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//5085/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//14575/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//5085 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//14575 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
index 62814d2..d2e27e0 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//7032/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//16575/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -18,9 +18,9 @@ Get:3 http://ftp.jp.debian.org experimental Release [4245B]
 Ign http://ftp.jp.debian.org experimental Release
 Get:4 http://ftp.jp.debian.org sid Release [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:5 http://ftp.jp.debian.org experimental/main Packages [142kB]
+Get:5 http://ftp.jp.debian.org experimental/main Packages [147kB]
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 152kB in 0s (415kB/s)
+Fetched 157kB in 0s (624kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -43,31 +43,31 @@ After unpacking 565kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   whiptail libnewt0.52 diff gcc-4.1-base libgcc1 libstdc++6 aptitude
   gettext-base
-(Reading database ... 12542 files and directories currently installed.)
+(Reading database ... 12560 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.2-1_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 12541 files and directories currently installed.)
+(Reading database ... 12559 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 12480 files and directories currently installed.)
+(Reading database ... 12498 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.2-1_amd64.deb) ...
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
 Selecting previously deselected package gcc-4.1-base.
-(Reading database ... 12548 files and directories currently installed.)
+(Reading database ... 12566 files and directories currently installed.)
 Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-0_amd64.deb) ...
 Preparing to replace libgcc1 1:4.0.3-1 (using .../libgcc1_1%3a4.1.0-0_amd64.deb) ...
 Unpacking replacement libgcc1 ...
 Setting up gcc-4.1-base (4.1.0-0) ...
 Setting up libgcc1 (4.1.0-0) ...
 
-(Reading database ... 12554 files and directories currently installed.)
+(Reading database ... 12572 files and directories currently installed.)
 Preparing to replace libstdc++6 4.0.3-1 (using .../libstdc++6_4.1.0-0_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.1.0-0) ...
 
-(Reading database ... 12554 files and directories currently installed.)
+(Reading database ... 12572 files and directories currently installed.)
 Preparing to replace aptitude 0.4.1-1 (using .../aptitude_0.4.1-1experimental1_amd64.deb) ...
 Unpacking replacement aptitude ...
 Preparing to replace gettext-base 0.14.5-2 (using .../gettext-base_0.14.5-2.csharp.1_amd64.deb) ...
@@ -98,10 +98,10 @@ Need to get 0B/1535kB of archives.
 After unpacking 9683kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
   apt-utils apt
-(Reading database ... 12554 files and directories currently installed.)
+(Reading database ... 12572 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 12351 files and directories currently installed.)
+(Reading database ... 12369 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43.3 (using .../apt-utils_0.6.43.3exp1_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43.3 (using .../apt_0.6.43.3exp1_amd64.deb) ...
@@ -117,9 +117,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//7032/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//16575/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//7032 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16575 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch-sid.log b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
index 65a005e..c147f8a 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//4934/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//14632/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -13,8 +13,8 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3946kB]
-Fetched 3952kB in 2s (1899kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3979kB]
+Fetched 3985kB in 1s (2069kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: You may want to run apt-get update to correct these problems
@@ -23,83 +23,59 @@ Obtaining the cached apt archive contents
 Reading package lists...
 Building dependency tree...
 The following packages will be upgraded:
-  base-files bash bsdutils console-data coreutils cpio cpp-3.3 cpp-4.0 debconf
-  debconf-i18n exim4 exim4-base exim4-config exim4-daemon-light g++-3.3
-  g++-4.0 gcc-3.3 gcc-3.3-base gcc-4.0 gcc-4.0-base info klogd libattr1 libc6
-  libc6-dev libgcc1 libperl5.8 libslang2 libssl0.9.8 libstdc++5
-  libstdc++5-3.3-dev libstdc++6 libstdc++6-4.0-dev linux-kernel-headers login
-  lsb-base make modutils mount passwd perl perl-base perl-modules psmisc
-  sysklogd util-linux zlib1g
-47 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 2955kB/41.5MB of archives.
-After unpacking 1442kB of additional disk space will be used.
+  bash bsdutils console-data coreutils cpio cpp-3.3 debconf debconf-i18n exim4
+  exim4-base exim4-config exim4-daemon-light g++-3.3 gcc-3.3 gcc-3.3-base info
+  initscripts klogd libattr1 libdb4.2 libdb4.3 libdb4.4 libperl5.8 libslang2
+  libssl0.9.8 libstdc++5 libstdc++5-3.3-dev linux-kernel-headers lsb-base make
+  modutils mount perl perl-base perl-modules psmisc sysklogd sysv-rc sysvinit
+  tar util-linux zlib1g
+42 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 7684kB/28.3MB of archives.
+After unpacking 2441kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  base-files bash bsdutils coreutils login mount perl-modules
-  linux-kernel-headers libc6-dev libc6 perl libperl5.8 perl-base lsb-base
-  util-linux debconf-i18n debconf cpp-4.0 gcc-4.0-base libgcc1 gcc-4.0 g++-4.0
-  libstdc++6-4.0-dev libstdc++6 libslang2 zlib1g cpio info sysklogd klogd
-  libssl0.9.8 modutils libattr1 passwd exim4-config exim4-base
-  exim4-daemon-light exim4 make console-data g++-3.3 gcc-3.3 cpp-3.3
-  gcc-3.3-base libstdc++5 libstdc++5-3.3-dev psmisc
-Get:1 http://ftp.jp.debian.org sid/main libperl5.8 5.8.8-3 [1008B]
-Get:2 http://ftp.jp.debian.org sid/main exim4-config 4.60-5 [268kB]
-Get:3 http://ftp.jp.debian.org sid/main exim4-base 4.60-5 [892kB]
-Get:4 http://ftp.jp.debian.org sid/main exim4-daemon-light 4.60-5 [415kB]
-Get:5 http://ftp.jp.debian.org sid/main exim4 4.60-5 [1572B]
-Get:6 http://ftp.jp.debian.org sid/main console-data 20060311 [1300kB]
-Get:7 http://ftp.jp.debian.org sid/main psmisc 22.2-1 [77.0kB]
-Fetched 2955kB in 1s (1846kB/s)
-(Reading database ... 12581 files and directories currently installed.)
-Preparing to replace base-files 3.1.10 (using .../base-files_3.1.11_amd64.deb) ...
-Unpacking replacement base-files ...
-Setting up base-files (3.1.11) ...
-
-(Reading database ... 12582 files and directories currently installed.)
+  bash bsdutils coreutils mount perl-modules libdb4.4 perl libperl5.8
+  perl-base sysvinit tar lsb-base util-linux debconf-i18n debconf initscripts
+  libslang2 sysv-rc zlib1g cpio info sysklogd klogd libssl0.9.8 modutils
+  libattr1 libdb4.3 libdb4.2 exim4-config exim4-base exim4-daemon-light exim4
+  linux-kernel-headers make console-data g++-3.3 gcc-3.3 cpp-3.3 gcc-3.3-base
+  libstdc++5 libstdc++5-3.3-dev psmisc
+Get:1 http://ftp.jp.debian.org sid/main console-data 20060317 [1326kB]
+Get:2 http://ftp.jp.debian.org sid/main g++-3.3 1:3.3.6-13 [1974kB]
+Get:3 http://ftp.jp.debian.org sid/main gcc-3.3 1:3.3.6-13 [1567kB]
+Get:4 http://ftp.jp.debian.org sid/main cpp-3.3 1:3.3.6-13 [1564kB]
+Get:5 http://ftp.jp.debian.org sid/main gcc-3.3-base 1:3.3.6-13 [151kB]
+Get:6 http://ftp.jp.debian.org sid/main libstdc++5 1:3.3.6-13 [291kB]
+Get:7 http://ftp.jp.debian.org sid/main libstdc++5-3.3-dev 1:3.3.6-13 [812kB]
+Fetched 7684kB in 3s (2431kB/s)
+(Reading database ... 12539 files and directories currently installed.)
 Preparing to replace bash 3.1-2 (using .../archives/bash_3.1-3_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.1-3) ...
 Installing new version of config file /etc/bash_completion ...
 Installing new version of config file /etc/skel/.bashrc ...
 
-(Reading database ... 12587 files and directories currently installed.)
+(Reading database ... 12544 files and directories currently installed.)
 Preparing to replace bsdutils 1:2.12r-6 (using .../bsdutils_1%3a2.12r-8_amd64.deb) ...
 Unpacking replacement bsdutils ...
 Setting up bsdutils (2.12r-8) ...
 
-(Reading database ... 12587 files and directories currently installed.)
+(Reading database ... 12544 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.94-1_amd64.deb) ...
 Removing `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 Removing `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
 Unpacking replacement coreutils ...
 Setting up coreutils (5.94-1) ...
 
-(Reading database ... 12607 files and directories currently installed.)
-Preparing to replace login 1:4.0.14-7 (using .../login_1%3a4.0.14-9_amd64.deb) ...
-Unpacking replacement login ...
-Setting up login (4.0.14-9) ...
-
-(Reading database ... 12607 files and directories currently installed.)
+(Reading database ... 12564 files and directories currently installed.)
 Preparing to replace mount 2.12r-6 (using .../mount_2.12r-8_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.12r-8) ...
 
-(Reading database ... 12607 files and directories currently installed.)
+(Reading database ... 12564 files and directories currently installed.)
 Preparing to replace perl-modules 5.8.8-2 (using .../perl-modules_5.8.8-3_all.deb) ...
 Unpacking replacement perl-modules ...
-Preparing to replace linux-kernel-headers 2.6.13+0rc3-2 (using .../linux-kernel-headers_2.6.13+0rc3-2.1_amd64.deb) ...
-Unpacking replacement linux-kernel-headers ...
-Preparing to replace libc6-dev 2.3.5-13 (using .../libc6-dev_2.3.6-3_amd64.deb) ...
-Unpacking replacement libc6-dev ...
-Preparing to replace libc6 2.3.5-13 (using .../libc6_2.3.6-3_amd64.deb) ...
-Unpacking replacement libc6 ...
-Setting up libc6 (2.3.6-3) ...
-Installing new version of config file /etc/init.d/glibc.sh ...
-Current default timezone: 'UTC'.
-Local time is now:      Fri Mar 17 03:13:18 UTC 2006.
-Universal Time is now:  Fri Mar 17 03:13:18 UTC 2006.
-Run 'tzconfig' if you wish to change it.
-
-(Reading database ... 12585 files and directories currently installed.)
+Preparing to replace libdb4.4 4.4.20-3 (using .../libdb4.4_4.4.20-4_amd64.deb) ...
+Unpacking replacement libdb4.4 ...
 Preparing to replace perl 5.8.8-2 (using .../perl_5.8.8-3_amd64.deb) ...
 Unpacking replacement perl ...
 Preparing to replace libperl5.8 5.8.8-2 (using .../libperl5.8_5.8.8-3_amd64.deb) ...
@@ -107,40 +83,39 @@ Unpacking replacement libperl5.8 ...
 Preparing to replace perl-base 5.8.8-2 (using .../perl-base_5.8.8-3_amd64.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.8-3) ...
-(Reading database ... 12585 files and directories currently installed.)
+(Reading database ... 12564 files and directories currently installed.)
+Preparing to replace sysvinit 2.86.ds1-12 (using .../sysvinit_2.86.ds1-13_amd64.deb) ...
+Unpacking replacement sysvinit ...
+Setting up sysvinit (2.86.ds1-13) ...
+init: timeout opening/writing control channel /dev/initctl
+
+(Reading database ... 12565 files and directories currently installed.)
+Preparing to replace tar 1.15.1-4 (using .../tar_1.15.1-6_amd64.deb) ...
+Unpacking replacement tar ...
+Setting up tar (1.15.1-6) ...
+
+(Reading database ... 12565 files and directories currently installed.)
 Preparing to replace lsb-base 3.0-15 (using .../lsb-base_3.0-16_all.deb) ...
 Unpacking replacement lsb-base ...
 Setting up lsb-base (3.0-16) ...
-(Reading database ... 12585 files and directories currently installed.)
+(Reading database ... 12565 files and directories currently installed.)
 Preparing to replace util-linux 2.12r-6 (using .../util-linux_2.12r-8_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12r-8) ...
 
-(Reading database ... 12585 files and directories currently installed.)
+(Reading database ... 12565 files and directories currently installed.)
 Preparing to replace debconf-i18n 1.4.71 (using .../debconf-i18n_1.4.72_all.deb) ...
 Unpacking replacement debconf-i18n ...
 Preparing to replace debconf 1.4.71 (using .../debconf_1.4.72_all.deb) ...
 Unpacking replacement debconf ...
-Preparing to replace cpp-4.0 4.0.2-9 (using .../cpp-4.0_4.0.3-1_amd64.deb) ...
-Unpacking replacement cpp-4.0 ...
-Preparing to replace gcc-4.0-base 4.0.2-9 (using .../gcc-4.0-base_4.0.3-1_amd64.deb) ...
-Unpacking replacement gcc-4.0-base ...
-Preparing to replace libgcc1 1:4.0.2-9 (using .../libgcc1_1%3a4.0.3-1_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up gcc-4.0-base (4.0.3-1) ...
-
-Setting up libgcc1 (4.0.3-1) ...
-
-(Reading database ... 12587 files and directories currently installed.)
-Preparing to replace gcc-4.0 4.0.2-9 (using .../gcc-4.0_4.0.3-1_amd64.deb) ...
-Unpacking replacement gcc-4.0 ...
-Preparing to replace g++-4.0 4.0.2-9 (using .../g++-4.0_4.0.3-1_amd64.deb) ...
-Unpacking replacement g++-4.0 ...
-Preparing to replace libstdc++6-4.0-dev 4.0.2-9 (using .../libstdc++6-4.0-dev_4.0.3-1_amd64.deb) ...
-Unpacking replacement libstdc++6-4.0-dev ...
-Preparing to replace libstdc++6 4.0.2-9 (using .../libstdc++6_4.0.3-1_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.0.3-1) ...
+Preparing to replace initscripts 2.86.ds1-12 (using .../initscripts_2.86.ds1-13_amd64.deb) ...
+Unpacking replacement initscripts ...
+Setting up initscripts (2.86.ds1-13) ...
+Installing new version of config file /etc/init.d/hostname.sh ...
+Installing new version of config file /etc/init.d/mountall.sh ...
+Installing new version of config file /etc/init.d/mountnfs.sh ...
+Installing new version of config file /etc/init.d/umountfs ...
+Installing new version of config file /etc/init.d/umountroot ...
 
 (Reading database ... 12567 files and directories currently installed.)
 Preparing to replace libslang2 2.0.5-3 (using .../libslang2_2.0.6-2_amd64.deb) ...
@@ -148,6 +123,11 @@ Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.6-2) ...
 
 (Reading database ... 12567 files and directories currently installed.)
+Preparing to replace sysv-rc 2.86.ds1-12 (using .../sysv-rc_2.86.ds1-13_all.deb) ...
+Unpacking replacement sysv-rc ...
+Setting up sysv-rc (2.86.ds1-13) ...
+
+(Reading database ... 12567 files and directories currently installed.)
 Preparing to replace zlib1g 1:1.2.3-9 (using .../zlib1g_1%3a1.2.3-11_amd64.deb) ...
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-11) ...
@@ -167,8 +147,10 @@ Preparing to replace modutils 2.4.27.0-3 (using .../modutils_2.4.27.0-5_amd64.de
 Unpacking replacement modutils ...
 Preparing to replace libattr1 2.4.25-1 (using .../libattr1_2.4.31-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
-Preparing to replace passwd 1:4.0.14-7 (using .../passwd_1%3a4.0.14-9_amd64.deb) ...
-Unpacking replacement passwd ...
+Preparing to replace libdb4.3 4.3.29-4.1 (using .../libdb4.3_4.3.29-5_amd64.deb) ...
+Unpacking replacement libdb4.3 ...
+Preparing to replace libdb4.2 4.2.52-23.1 (using .../libdb4.2_4.2.52-24_amd64.deb) ...
+Unpacking replacement libdb4.2 ...
 Preparing to replace exim4-config 4.60-4 (using .../exim4-config_4.60-5_all.deb) ...
 Unpacking replacement exim4-config ...
 Preparing to replace exim4-base 4.60-4 (using .../exim4-base_4.60-5_amd64.deb) ...
@@ -177,30 +159,29 @@ Preparing to replace exim4-daemon-light 4.60-4 (using .../exim4-daemon-light_4.6
 Unpacking replacement exim4-daemon-light ...
 Preparing to replace exim4 4.60-4 (using .../archives/exim4_4.60-5_all.deb) ...
 Unpacking replacement exim4 ...
+Preparing to replace linux-kernel-headers 2.6.13+0rc3-2 (using .../linux-kernel-headers_2.6.13+0rc3-2.1_amd64.deb) ...
+Unpacking replacement linux-kernel-headers ...
 Preparing to replace make 3.80+3.81.b4-1 (using .../make_3.80+3.81.rc1-1_amd64.deb) ...
 Unpacking replacement make ...
-Preparing to replace console-data 2002.12.04dbs-52.2 (using .../console-data_20060311_all.deb) ...
+Preparing to replace console-data 2002.12.04dbs-52.2 (using .../console-data_20060317_all.deb) ...
 Unpacking replacement console-data ...
-Preparing to replace g++-3.3 1:3.3.6-10 (using .../g++-3.3_1%3a3.3.6-12_amd64.deb) ...
+Preparing to replace g++-3.3 1:3.3.6-10 (using .../g++-3.3_1%3a3.3.6-13_amd64.deb) ...
 Unpacking replacement g++-3.3 ...
-Preparing to replace gcc-3.3 1:3.3.6-10 (using .../gcc-3.3_1%3a3.3.6-12_amd64.deb) ...
+Preparing to replace gcc-3.3 1:3.3.6-10 (using .../gcc-3.3_1%3a3.3.6-13_amd64.deb) ...
 Unpacking replacement gcc-3.3 ...
-Preparing to replace cpp-3.3 1:3.3.6-10 (using .../cpp-3.3_1%3a3.3.6-12_amd64.deb) ...
+Preparing to replace cpp-3.3 1:3.3.6-10 (using .../cpp-3.3_1%3a3.3.6-13_amd64.deb) ...
 Unpacking replacement cpp-3.3 ...
-Preparing to replace gcc-3.3-base 1:3.3.6-10 (using .../gcc-3.3-base_1%3a3.3.6-12_amd64.deb) ...
+Preparing to replace gcc-3.3-base 1:3.3.6-10 (using .../gcc-3.3-base_1%3a3.3.6-13_amd64.deb) ...
 Unpacking replacement gcc-3.3-base ...
-Preparing to replace libstdc++5 1:3.3.6-10 (using .../libstdc++5_1%3a3.3.6-12_amd64.deb) ...
+Preparing to replace libstdc++5 1:3.3.6-10 (using .../libstdc++5_1%3a3.3.6-13_amd64.deb) ...
 Unpacking replacement libstdc++5 ...
-Preparing to replace libstdc++5-3.3-dev 1:3.3.6-10 (using .../libstdc++5-3.3-dev_1%3a3.3.6-12_amd64.deb) ...
+Preparing to replace libstdc++5-3.3-dev 1:3.3.6-10 (using .../libstdc++5-3.3-dev_1%3a3.3.6-13_amd64.deb) ...
 Unpacking replacement libstdc++5-3.3-dev ...
 Preparing to replace psmisc 22.1-1 (using .../psmisc_22.2-1_amd64.deb) ...
 Unpacking replacement psmisc ...
-Setting up linux-kernel-headers (2.6.13+0rc3-2.1) ...
-Setting up libc6-dev (2.3.6-3) ...
+Setting up libdb4.4 (4.4.20-4) ...
 Setting up libperl5.8 (5.8.8-3) ...
 
-Setting up cpp-4.0 (4.0.3-1) ...
-Setting up gcc-4.0 (4.0.3-1) ...
 Setting up cpio (2.6-11) ...
 
 Setting up info (4.8-7) ...
@@ -210,31 +191,29 @@ Architecture-specific modutils configuration for x86_64 not found, using default
 
 Setting up libattr1 (2.4.31-1) ...
 
-Setting up passwd (4.0.14-9) ...
-
+Setting up libdb4.3 (4.3.29-5) ...
+Setting up libdb4.2 (4.2.52-24) ...
+Setting up linux-kernel-headers (2.6.13+0rc3-2.1) ...
 Setting up make (3.80+3.81.rc1-1) ...
 
-Setting up gcc-3.3-base (3.3.6-12) ...
-Setting up cpp-3.3 (3.3.6-12) ...
-Setting up gcc-3.3 (3.3.6-12) ...
-Setting up libstdc++5 (3.3.6-12) ...
+Setting up gcc-3.3-base (3.3.6-13) ...
+Setting up cpp-3.3 (3.3.6-13) ...
+Setting up gcc-3.3 (3.3.6-13) ...
+Setting up libstdc++5 (3.3.6-13) ...
 
 Setting up psmisc (22.2-1) ...
 
 Setting up debconf-i18n (1.4.72) ...
-Setting up g++-4.0 (4.0.3-1) ...
 Setting up klogd (1.4.1-17.1) ...
 Installing new version of config file /etc/init.d/klogd ...
 Stopping kernel log daemon: klogd.
 
 Setting up sysklogd (1.4.1-17.1) ...
 
-Setting up g++-3.3 (3.3.6-12) ...
+Setting up g++-3.3 (3.3.6-13) ...
 Setting up perl-modules (5.8.8-3) ...
 Setting up debconf (1.4.72) ...
 
-Setting up libstdc++6-4.0-dev (4.0.3-1) ...
-
 Setting up libssl0.9.8 (0.9.8a-8) ...
 
 Setting up exim4-config (4.60-5) ...
@@ -246,11 +225,11 @@ Setting up exim4-base (4.60-5) ...
 Setting up exim4-daemon-light (4.60-5) ...
 
 Setting up exim4 (4.60-5) ...
-Setting up console-data (20060311) ...
+Setting up console-data (20060317) ...
 Looking for keymap to install:
 NONE
 
-Setting up libstdc++5-3.3-dev (3.3.6-12) ...
+Setting up libstdc++5-3.3-dev (3.3.6-13) ...
 Setting up perl (5.8.8-3) ...
 
 Reading package lists...
@@ -260,22 +239,22 @@ dpkg-dev is already the newest version.
 apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Copying back the cached apt archive contents
- -> new cache content libperl5.8_5.8.8-3_amd64.deb added
- -> new cache content exim4-config_4.60-5_all.deb added
- -> new cache content exim4-base_4.60-5_amd64.deb added
- -> new cache content exim4-daemon-light_4.60-5_amd64.deb added
- -> new cache content exim4_4.60-5_all.deb added
- -> new cache content console-data_20060311_all.deb added
- -> new cache content psmisc_22.2-1_amd64.deb added
+ -> new cache content console-data_20060317_all.deb added
+ -> new cache content g++-3.3_1%3a3.3.6-13_amd64.deb added
+ -> new cache content gcc-3.3_1%3a3.3.6-13_amd64.deb added
+ -> new cache content cpp-3.3_1%3a3.3.6-13_amd64.deb added
+ -> new cache content gcc-3.3-base_1%3a3.3.6-13_amd64.deb added
+ -> new cache content libstdc++5_1%3a3.3.6-13_amd64.deb added
+ -> new cache content libstdc++5-3.3-dev_1%3a3.3.6-13_amd64.deb added
 umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//4934/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//14632/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//4934 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//14632 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch.log b/testsuite/normal/pbuilder-update-sarge-etch.log
index b20f4f2..362be8d 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch.log
@@ -1,18 +1,18 @@
 Upgrading for distribution etch
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//688/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//10508/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org etch/main Packages [3688kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3699kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3688kB in 1s (1979kB/s)
+Fetched 3699kB in 7s (500kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -42,14 +42,14 @@ The following packages will be upgraded:
   perl-modules ppp pppconfig pppoeconf procps psmisc sed sysv-rc sysvinit tar
   tasksel tcpd telnet util-linux wget whiptail zlib1g
 124 upgraded, 19 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/65.2MB of archives.
-After unpacking 39.2MB of additional disk space will be used.
+Need to get 0B/65.0MB of archives.
+After unpacking 38.2MB of additional disk space will be used.
 (Reading database ... 10950 files and directories currently installed.)
 Preparing to replace linux-kernel-headers 2.5.999-test7-bk-17 (using .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
 Unpacking replacement linux-kernel-headers ...
-Preparing to replace libc6-dev 2.3.2.ds1-22 (using .../libc6-dev_2.3.5-13_amd64.deb) ...
+Preparing to replace libc6-dev 2.3.2.ds1-22 (using .../libc6-dev_2.3.6-3_amd64.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace libc6 2.3.2.ds1-22 (using .../libc6_2.3.5-13_amd64.deb) ...
+Preparing to replace libc6 2.3.2.ds1-22 (using .../libc6_2.3.6-3_amd64.deb) ...
 
 Name Service Switch update in the C Library: pre-installation question.
 
@@ -73,39 +73,39 @@ answer No to the question below.
 Non-interactive mode, upgrade glibc forcibly
 
 Unpacking replacement libc6 ...
-Setting up libc6 (2.3.5-13) ...
+Setting up libc6 (2.3.6-3) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Fri Mar 17 03:11:44 UTC 2006.
-Universal Time is now:  Fri Mar 17 03:11:44 UTC 2006.
+Local time is now:      Mon Mar 20 03:11:13 UTC 2006.
+Universal Time is now:  Mon Mar 20 03:11:13 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 11284 files and directories currently installed.)
+(Reading database ... 11262 files and directories currently installed.)
 Preparing to replace debianutils 2.8.4 (using .../debianutils_2.15.3_amd64.deb) ...
 Unpacking replacement debianutils ...
 Replacing files in old package passwd ...
 Setting up debianutils (2.15.3) ...
 
-(Reading database ... 11297 files and directories currently installed.)
+(Reading database ... 11275 files and directories currently installed.)
 Preparing to replace libncurses5 5.4-4 (using .../libncurses5_5.5-1_amd64.deb) ...
 Unpacking replacement libncurses5 ...
 Setting up libncurses5 (5.5-1) ...
 
-(Reading database ... 11298 files and directories currently installed.)
+(Reading database ... 11276 files and directories currently installed.)
 Preparing to replace base-passwd 3.5.9 (using .../base-passwd_3.5.11_amd64.deb) ...
 Unpacking replacement base-passwd ...
 Setting up base-passwd (3.5.11) ...
 
-(Reading database ... 11299 files and directories currently installed.)
-Preparing to replace base-files 3.1.2 (using .../base-files_3.1.10_amd64.deb) ...
+(Reading database ... 11277 files and directories currently installed.)
+Preparing to replace base-files 3.1.2 (using .../base-files_3.1.11_amd64.deb) ...
 Unpacking replacement base-files ...
 dpkg: warning - unable to delete old file `/usr/doc': Directory not empty
-Setting up base-files (3.1.10) ...
+Setting up base-files (3.1.11) ...
 Installing new version of config file /etc/debian_version ...
 Installing new version of config file /etc/issue ...
 Installing new version of config file /etc/issue.net ...
 
-(Reading database ... 11296 files and directories currently installed.)
+(Reading database ... 11274 files and directories currently installed.)
 Preparing to replace bash 2.05b-26 (using .../archives/bash_3.1-2_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.1-2) ...
@@ -114,17 +114,17 @@ Installing new version of config file /etc/bash_completion ...
 Installing new version of config file /etc/skel/.bashrc ...
 Installing new version of config file /etc/skel/.bash_profile ...
 
-(Reading database ... 11301 files and directories currently installed.)
+(Reading database ... 11279 files and directories currently installed.)
 Preparing to replace bsdutils 1:2.12p-4 (using .../bsdutils_1%3a2.12r-6_amd64.deb) ...
 Unpacking replacement bsdutils ...
 Setting up bsdutils (2.12r-6) ...
 
-(Reading database ... 11301 files and directories currently installed.)
+(Reading database ... 11279 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2 (using .../coreutils_5.2.1-2.1_amd64.deb) ...
 Unpacking replacement coreutils ...
 Setting up coreutils (5.2.1-2.1) ...
 
-(Reading database ... 11300 files and directories currently installed.)
+(Reading database ... 11278 files and directories currently installed.)
 Preparing to replace dpkg 1.10.28 (using .../dpkg_1.13.16_amd64.deb) ...
 Unpacking replacement dpkg ...
 Setting up dpkg (1.13.16) ...
@@ -132,61 +132,61 @@ Installing new version of config file /etc/dpkg/origins/debian ...
 Adding `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
 Adding `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 
-(Reading database ... 11276 files and directories currently installed.)
+(Reading database ... 11254 files and directories currently installed.)
 Preparing to replace e2fslibs 1.37-2sarge1 (using .../e2fslibs_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11276 files and directories currently installed.)
+(Reading database ... 11254 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.37-2sarge1 (using .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Replacing files in old package libuuid1 ...
 Replacing files in old package libblkid1 ...
 Setting up e2fsprogs (1.38+1.39-WIP-2005.12.31-1) ...
-(Reading database ... 11280 files and directories currently installed.)
+(Reading database ... 11258 files and directories currently installed.)
 Preparing to replace findutils 4.1.20-6 (using .../findutils_4.2.27-1_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.27-1) ...
 Installing new version of config file /etc/updatedb.conf ...
 
-(Reading database ... 11301 files and directories currently installed.)
+(Reading database ... 11279 files and directories currently installed.)
 Preparing to replace grep 2.5.1.ds1-4 (using .../grep_2.5.1.ds2-4_amd64.deb) ...
 Unpacking replacement grep ...
 Setting up grep (2.5.1.ds2-4) ...
 
-(Reading database ... 11300 files and directories currently installed.)
+(Reading database ... 11278 files and directories currently installed.)
 Preparing to replace gzip 1.3.5-10 (using .../gzip_1.3.5-12_amd64.deb) ...
 Unpacking replacement gzip ...
 Setting up gzip (1.3.5-12) ...
 
-(Reading database ... 11300 files and directories currently installed.)
+(Reading database ... 11278 files and directories currently installed.)
 Preparing to replace hostname 2.13 (using .../hostname_2.92_amd64.deb) ...
 Unpacking replacement hostname ...
 Setting up hostname (2.92) ...
 Selecting previously deselected package libdb4.3.
-(Reading database ... 11300 files and directories currently installed.)
+(Reading database ... 11278 files and directories currently installed.)
 Unpacking libdb4.3 (from .../libdb4.3_4.3.29-4.1_amd64.deb) ...
 Selecting previously deselected package libsepol1.
 Unpacking libsepol1 (from .../libsepol1_1.10-2_amd64.deb) ...
 Setting up libsepol1 (1.10-2) ...
 
 Selecting previously deselected package libselinux1.
-(Reading database ... 11309 files and directories currently installed.)
+(Reading database ... 11287 files and directories currently installed.)
 Unpacking libselinux1 (from .../libselinux1_1.28-4_amd64.deb) ...
 Setting up libselinux1 (1.28-4) ...
 
-(Reading database ... 11314 files and directories currently installed.)
+(Reading database ... 11292 files and directories currently installed.)
 Preparing to replace libpam-runtime 0.76-22 (using .../libpam-runtime_0.79-3.1_all.deb) ...
 Unpacking replacement libpam-runtime ...
 Setting up libpam-runtime (0.79-3.1) ...
 Installing new version of config file /etc/pam.conf ...
 
-(Reading database ... 11314 files and directories currently installed.)
+(Reading database ... 11292 files and directories currently installed.)
 Preparing to replace libpam0g 0.76-22 (using .../libpam0g_0.79-3.1_amd64.deb) ...
 Unpacking replacement libpam0g ...
 Setting up libpam0g (0.79-3.1) ...
 
-(Reading database ... 11314 files and directories currently installed.)
+(Reading database ... 11292 files and directories currently installed.)
 Preparing to replace libpam-modules 0.76-22 (using .../libpam-modules_0.79-3.1_amd64.deb) ...
 Unpacking replacement libpam-modules ...
 Setting up libdb4.3 (4.3.29-4.1) ...
@@ -195,24 +195,24 @@ Installing new version of config file /etc/security/limits.conf ...
 Installing new version of config file /etc/security/access.conf ...
 Installing new version of config file /etc/security/pam_env.conf ...
 
-(Reading database ... 11318 files and directories currently installed.)
-Preparing to replace login 1:4.0.3-31sarge5 (using .../login_1%3a4.0.14-7_amd64.deb) ...
+(Reading database ... 11296 files and directories currently installed.)
+Preparing to replace login 1:4.0.3-31sarge5 (using .../login_1%3a4.0.14-9_amd64.deb) ...
 Unpacking replacement login ...
-Setting up login (4.0.14-7) ...
+Setting up login (4.0.14-9) ...
 Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11364 files and directories currently installed.)
+(Reading database ... 11342 files and directories currently installed.)
 Preparing to replace mount 2.12p-4 (using .../mount_2.12r-6_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.12r-6) ...
 
-(Reading database ... 11364 files and directories currently installed.)
+(Reading database ... 11342 files and directories currently installed.)
 Preparing to replace ncurses-bin 5.4-4 (using .../ncurses-bin_5.5-1_amd64.deb) ...
 Unpacking replacement ncurses-bin ...
 Setting up ncurses-bin (5.5-1) ...
-(Reading database ... 11364 files and directories currently installed.)
+(Reading database ... 11342 files and directories currently installed.)
 Preparing to replace perl-modules 5.8.4-8 (using .../perl-modules_5.8.8-2_all.deb) ...
 Unpacking replacement perl-modules ...
 Selecting previously deselected package libdb4.4.
@@ -222,46 +222,46 @@ Unpacking replacement libperl5.8 ...
 Preparing to replace perl-base 5.8.4-8 (using .../perl-base_5.8.8-2_amd64.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.8-2) ...
-(Reading database ... 11523 files and directories currently installed.)
+(Reading database ... 11501 files and directories currently installed.)
 Preparing to replace perl 5.8.4-8 (using .../perl_5.8.8-2_amd64.deb) ...
 Unpacking replacement perl ...
 Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-5_amd64.deb) ...
 Unpacking replacement sed ...
 Setting up sed (4.1.4-5) ...
 
-(Reading database ... 11884 files and directories currently installed.)
+(Reading database ... 11862 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-12_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-12) ...
 
-(Reading database ... 11894 files and directories currently installed.)
+(Reading database ... 11872 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-12_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-12) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11895 files and directories currently installed.)
+(Reading database ... 11873 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../tar_1.15.1-4_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-4) ...
 
 Selecting previously deselected package lsb-base.
-(Reading database ... 11899 files and directories currently installed.)
+(Reading database ... 11877 files and directories currently installed.)
 Unpacking lsb-base (from .../lsb-base_3.0-15_all.deb) ...
 Setting up lsb-base (3.0-15) ...
 Selecting previously deselected package libslang2.
-(Reading database ... 11906 files and directories currently installed.)
+(Reading database ... 11884 files and directories currently installed.)
 Unpacking libslang2 (from .../libslang2_2.0.5-3_amd64.deb) ...
 Setting up libslang2 (2.0.5-3) ...
 
-(Reading database ... 11918 files and directories currently installed.)
+(Reading database ... 11896 files and directories currently installed.)
 Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12r-6_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12r-6) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11918 files and directories currently installed.)
+(Reading database ... 11896 files and directories currently installed.)
 Preparing to replace ncurses-base 5.4-4 (using .../ncurses-base_5.5-1_all.deb) ...
 Removing obsolete conffile /etc/terminfo/E/Eterm ...
 Removing obsolete conffile /etc/terminfo/E/Eterm-color ...
@@ -299,7 +299,7 @@ Removing obsolete conffile /etc/terminfo/x/xterm-vt220 ...
 Removing obsolete conffile /etc/terminfo/x/xterm-color ...
 Unpacking replacement ncurses-base ...
 Setting up ncurses-base (5.5-1) ...
-(Reading database ... 11922 files and directories currently installed.)
+(Reading database ... 11900 files and directories currently installed.)
 Preparing to replace liblocale-gettext-perl 1.01-17 (using .../liblocale-gettext-perl_1.05-1_amd64.deb) ...
 Unpacking replacement liblocale-gettext-perl ...
 Preparing to replace libtext-iconv-perl 1.2-3 (using .../libtext-iconv-perl_1.4-2_amd64.deb) ...
@@ -325,22 +325,23 @@ Setting up libtext-wrapi18n-perl (0.06-4) ...
 Setting up debconf-i18n (1.4.71) ...
 Setting up debconf (1.4.71) ...
 
-(Reading database ... 11950 files and directories currently installed.)
+(Reading database ... 11928 files and directories currently installed.)
 Preparing to replace console-common 0.7.49 (using .../console-common_0.7.55.1_all.deb) ...
 Unpacking replacement console-common ...
 Selecting previously deselected package gcc-4.0-base.
-Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.2-9_amd64.deb) ...
-Preparing to replace libgcc1 1:3.4.3-13 (using .../libgcc1_1%3a4.0.2-9_amd64.deb) ...
+Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.3-1_amd64.deb) ...
+Preparing to replace libgcc1 1:3.4.3-13 (using .../libgcc1_1%3a4.0.3-1_amd64.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up gcc-4.0-base (4.0.2-9) ...
-Setting up libgcc1 (4.0.2-9) ...
+Setting up gcc-4.0-base (4.0.3-1) ...
+
+Setting up libgcc1 (4.0.3-1) ...
 
 Selecting previously deselected package libstdc++6.
-(Reading database ... 11963 files and directories currently installed.)
-Unpacking libstdc++6 (from .../libstdc++6_4.0.2-9_amd64.deb) ...
-Setting up libstdc++6 (4.0.2-9) ...
+(Reading database ... 11941 files and directories currently installed.)
+Unpacking libstdc++6 (from .../libstdc++6_4.0.3-1_amd64.deb) ...
+Setting up libstdc++6 (4.0.3-1) ...
 
-(Reading database ... 11966 files and directories currently installed.)
+(Reading database ... 11944 files and directories currently installed.)
 Preparing to replace apt-utils 0.5.28.6 (using .../apt-utils_0.6.43.3_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Selecting previously deselected package libncursesw5.
@@ -353,12 +354,12 @@ Preparing to replace apt 0.5.28.6 (using .../apt_0.6.43.3_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.43.3) ...
 
-(Reading database ... 11997 files and directories currently installed.)
+(Reading database ... 11975 files and directories currently installed.)
 Preparing to replace dselect 1.10.28 (using .../dselect_1.13.16_amd64.deb) ...
 Unpacking replacement dselect ...
 Setting up dselect (1.13.16) ...
 Installing new version of config file /etc/dpkg/dselect.cfg ...
-(Reading database ... 12022 files and directories currently installed.)
+(Reading database ... 12000 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-12_amd64.deb) ...
 Unmodified conffile '/etc/init.d/bootclean.sh' obsolete; removed `/etc/init.d/bootclean.sh'
 Unpacking replacement initscripts ...
@@ -381,7 +382,7 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/urandom ...
 Installing new version of config file /etc/default/tmpfs ...
 
-(Reading database ... 12037 files and directories currently installed.)
+(Reading database ... 12015 files and directories currently installed.)
 Preparing to replace libattr1 2.4.16-1 (using .../libattr1_2.4.25-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.23-1 (using .../libacl1_2.2.35-1_amd64.deb) ...
@@ -390,27 +391,27 @@ Setting up libattr1 (2.4.25-1) ...
 
 Setting up libacl1 (2.2.35-1) ...
 
-(Reading database ... 12037 files and directories currently installed.)
+(Reading database ... 12015 files and directories currently installed.)
 Preparing to replace libblkid1 1.37-2sarge1 (using .../libblkid1_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libblkid1 ...
 Setting up libblkid1 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 12037 files and directories currently installed.)
+(Reading database ... 12015 files and directories currently installed.)
 Preparing to replace libcomerr2 1.37-2sarge1 (using .../libcomerr2_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 12037 files and directories currently installed.)
+(Reading database ... 12015 files and directories currently installed.)
 Preparing to replace libss2 1.37-2sarge1 (using .../libss2_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 12037 files and directories currently installed.)
+(Reading database ... 12015 files and directories currently installed.)
 Preparing to replace libuuid1 1.37-2sarge1 (using .../libuuid1_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 12037 files and directories currently installed.)
+(Reading database ... 12015 files and directories currently installed.)
 Preparing to replace libgpg-error0 1.0-1 (using .../libgpg-error0_1.2-1_amd64.deb) ...
 Unpacking replacement libgpg-error0 ...
 Preparing to replace libgcrypt11 1.2.0-11.1 (using .../libgcrypt11_1.2.2-1_amd64.deb) ...
@@ -419,7 +420,7 @@ Preparing to replace zlib1g 1:1.2.2-4 (using .../zlib1g_1%3a1.2.3-9_amd64.deb) .
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-9) ...
 
-(Reading database ... 12040 files and directories currently installed.)
+(Reading database ... 12018 files and directories currently installed.)
 Preparing to replace libopencdk8 0.5.5-10 (using .../libopencdk8_0.5.7-2_amd64.deb) ...
 Unpacking replacement libopencdk8 ...
 Preparing to replace libtasn1-2 0.2.10-3 (using .../libtasn1-2_0.2.17-1_amd64.deb) ...
@@ -452,13 +453,13 @@ Preparing to replace netbase 4.21 (using .../archives/netbase_4.24_all.deb) ...
 Unpacking replacement netbase ...
 Preparing to replace exim4-base 4.50-8 (using .../exim4-base_4.60-4_amd64.deb) ...
 Unpacking replacement exim4-base ...
-Preparing to replace passwd 1:4.0.3-31sarge5 (using .../passwd_1%3a4.0.14-7_amd64.deb) ...
+Preparing to replace passwd 1:4.0.3-31sarge5 (using .../passwd_1%3a4.0.14-9_amd64.deb) ...
 Unpacking replacement passwd ...
-Setting up passwd (4.0.14-7) ...
+Setting up passwd (4.0.14-9) ...
 Installing new version of config file /etc/pam.d/chfn ...
 Installing new version of config file /etc/pam.d/chsh ...
 
-(Reading database ... 12174 files and directories currently installed.)
+(Reading database ... 12152 files and directories currently installed.)
 Preparing to replace binutils 2.15-6 (using .../binutils_2.16.1cvs20060117-1_amd64.deb) ...
 Unpacking replacement binutils ...
 Preparing to replace libstdc++5-3.3-dev 1:3.3.5-13 (using .../libstdc++5-3.3-dev_1%3a3.3.6-10_amd64.deb) ...
@@ -477,7 +478,7 @@ Setting up gcc-3.3-base (3.3.6-10) ...
 Setting up libstdc++5 (3.3.6-10) ...
 
 Selecting previously deselected package dmidecode.
-(Reading database ... 12196 files and directories currently installed.)
+(Reading database ... 12174 files and directories currently installed.)
 Unpacking dmidecode (from .../dmidecode_2.8-1_amd64.deb) ...
 Selecting previously deselected package laptop-detect.
 Unpacking laptop-detect (from .../laptop-detect_0.12.1_amd64.deb) ...
@@ -529,7 +530,7 @@ Preparing to replace at 3.1.8-11 (using .../archives/at_3.1.10_amd64.deb) ...
 Stopping deferred execution scheduler: atd.
 Unpacking replacement at ...
 Selecting previously deselected package cpp-4.0.
-Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-9_amd64.deb) ...
+Unpacking cpp-4.0 (from .../cpp-4.0_4.0.3-1_amd64.deb) ...
 Preparing to replace cpp 4:3.3.5-3 (using .../cpp_4%3a4.0.2-2_amd64.deb) ...
 Unpacking replacement cpp ...
 Preparing to replace patch 2.5.9-2 (using .../patch_2.5.9-4_amd64.deb) ...
@@ -541,14 +542,14 @@ Unpacking replacement dpkg-dev ...
 Preparing to replace exim4 4.50-8 (using .../archives/exim4_4.60-4_all.deb) ...
 Unpacking replacement exim4 ...
 Selecting previously deselected package gcc-4.0.
-Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-9_amd64.deb) ...
+Unpacking gcc-4.0 (from .../gcc-4.0_4.0.3-1_amd64.deb) ...
 Preparing to replace gcc 4:3.3.5-3 (using .../gcc_4%3a4.0.2-2_amd64.deb) ...
 Removing old gcc doc directory.
 Unpacking replacement gcc ...
 Selecting previously deselected package libstdc++6-4.0-dev.
-Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-9_amd64.deb) ...
+Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.3-1_amd64.deb) ...
 Selecting previously deselected package g++-4.0.
-Unpacking g++-4.0 (from .../g++-4.0_4.0.2-9_amd64.deb) ...
+Unpacking g++-4.0 (from .../g++-4.0_4.0.3-1_amd64.deb) ...
 Preparing to replace g++ 4:3.3.5-3 (using .../g++_4%3a4.0.2-2_amd64.deb) ...
 Unpacking replacement g++ ...
 Preparing to replace liblockfile1 1.06 (using .../liblockfile1_1.06.1_amd64.deb) ...
@@ -582,7 +583,7 @@ Unpacking replacement libdb1-compat ...
 Preparing to replace libssl0.9.7 0.9.7e-3 (using .../libssl0.9.7_0.9.7g-5_amd64.deb) ...
 Unpacking replacement libssl0.9.7 ...
 Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
-Setting up libc6-dev (2.3.5-13) ...
+Setting up libc6-dev (2.3.6-3) ...
 Setting up libdb4.4 (4.4.20-3) ...
 Setting up libperl5.8 (5.8.8-2) ...
 
@@ -720,14 +721,14 @@ Installing new version of config file /etc/sysctl.conf ...
 Setting up at (3.1.10) ...
 Installing new version of config file /etc/init.d/atd ...
 
-Setting up cpp-4.0 (4.0.2-9) ...
+Setting up cpp-4.0 (4.0.3-1) ...
 Setting up cpp (4.0.2-2) ...
 
 Setting up patch (2.5.9-4) ...
 Setting up make (3.80+3.81.b4-1) ...
 
 Setting up exim4 (4.60-4) ...
-Setting up gcc-4.0 (4.0.2-9) ...
+Setting up gcc-4.0 (4.0.3-1) ...
 Setting up gcc (4.0.2-2) ...
 
 Setting up liblockfile1 (1.06.1) ...
@@ -759,7 +760,11 @@ Setting up libdb1-compat (2.1.3-9) ...
 Setting up libssl0.9.7 (0.9.7g-5) ...
 
 Setting up libstdc++5-3.3-dev (3.3.6-10) ...
-Setting up libstdc++6-4.0-dev (4.0.2-9) ...
+Setting up g++-4.0 (4.0.3-1) ...
+Setting up libstdc++6-4.0-dev (4.0.3-1) ...
+
+Setting up g++ (4.0.2-2) ...
+
 Setting up perl-modules (5.8.8-2) ...
 Setting up console-common (0.7.55.1) ...
 Installing new version of config file /etc/init.d/keymap.sh ...
@@ -770,9 +775,6 @@ Setting up console-tools (0.2.3dbs-60) ...
 Installing new version of config file /etc/init.d/console-screen.sh ...
 
 Setting up g++-3.3 (3.3.6-10) ...
-Setting up g++-4.0 (4.0.2-9) ...
-Setting up g++ (4.0.2-2) ...
-
 Setting up perl (5.8.8-2) ...
 
 Setting up dpkg-dev (1.13.16) ...
@@ -792,9 +794,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//688/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//10508/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//688 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//10508 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index 049c803..8650c92 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/30122/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/7272/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -24,7 +24,7 @@ The following NEW packages will be installed:
 Need to get 0B/136kB of archives.
 After unpacking 758kB of additional disk space will be used.
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11257 files and directories currently installed.)
+(Reading database ... 11215 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.38_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.38_amd64.deb) ...
@@ -58,7 +58,7 @@ The following NEW packages will be installed:
 Need to get 0B/2901kB of archives.
 After unpacking 9617kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11354 files and directories currently installed.)
+(Reading database ... 11312 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -98,7 +98,7 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11952 files and directories currently installed.)
+(Reading database ... 11910 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
@@ -111,14 +111,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -307,18 +307,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -331,26 +331,25 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -388,8 +387,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -401,7 +400,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Mar 17 03:19:09 UTC 2006
+Mon Mar 20 03:18:46 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -471,7 +470,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Mar 17 03:19:14 UTC 2006
+Mon Mar 20 03:18:51 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -487,9 +486,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -499,58 +498,58 @@ dh_clean: Compatibility levels before 4 are deprecated.
 dh_installdirs
 dh_installdirs: Compatibility levels before 4 are deprecated.
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -589,6 +588,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/30122 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/7272 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sarge.log b/testsuite/normal/pdebuild-internal-sarge.log
index bc7068a..f31634b 100644
--- a/testsuite/normal/pdebuild-internal-sarge.log
+++ b/testsuite/normal/pdebuild-internal-sarge.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/25892/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/3126/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -110,14 +110,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -305,18 +305,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -329,26 +329,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -384,10 +384,10 @@ success
 success
 success
 success
+a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -399,7 +399,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Mar 17 03:10:52 UTC 2006
+Mon Mar 20 03:10:14 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -412,6 +412,18 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -426,18 +438,6 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -469,14 +469,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Mar 17 03:10:57 UTC 2006
+Mon Mar 20 03:10:19 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
 c: c
 dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -485,9 +485,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -495,58 +495,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
   for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
     /usr/bin/install -c -m 644 ./$file \
-		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -570,6 +570,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/25892 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/3126 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index a840f9f..5210754 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/28215/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/5652/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -21,19 +21,22 @@ Recommended packages:
 The following NEW packages will be installed:
   cdebootstrap libdebian-installer-extra4 libdebian-installer4 pbuilder
 0 upgraded, 4 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/137kB of archives.
-After unpacking 758kB of additional disk space will be used.
+Need to get 35.3kB/137kB of archives.
+After unpacking 766kB of additional disk space will be used.
+Get:1 http://ftp.jp.debian.org sid/main libdebian-installer4 0.41 [25.8kB]
+Get:2 http://ftp.jp.debian.org sid/main libdebian-installer-extra4 0.41 [9472B]
+Fetched 35.3kB in 0s (99.1kB/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11244 files and directories currently installed.)
-Unpacking libdebian-installer4 (from .../libdebian-installer4_0.38_amd64.deb) ...
+(Reading database ... 11245 files and directories currently installed.)
+Unpacking libdebian-installer4 (from .../libdebian-installer4_0.41_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
-Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.38_amd64.deb) ...
+Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.41_amd64.deb) ...
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.3.11_amd64.deb) ...
 Selecting previously deselected package pbuilder.
 Unpacking pbuilder (from .../pbuilder_0.149_all.deb) ...
-Setting up libdebian-installer4 (0.38) ...
-Setting up libdebian-installer-extra4 (0.38) ...
+Setting up libdebian-installer4 (0.41) ...
+Setting up libdebian-installer-extra4 (0.41) ...
 Setting up cdebootstrap (0.3.11) ...
 Setting up pbuilder (0.149) ...
 Setting DEBBUILDOPTS=
@@ -55,10 +58,10 @@ The following NEW packages will be installed:
   debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/2917kB of archives.
-After unpacking 9708kB of additional disk space will be used.
+Need to get 0B/2910kB of archives.
+After unpacking 9699kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11341 files and directories currently installed.)
+(Reading database ... 11342 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -67,11 +70,11 @@ Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
 Unpacking gettext (from .../gettext_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package intltool-debian.
-Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
+Unpacking intltool-debian (from .../intltool-debian_0.34.1+20060220_all.deb) ...
 Selecting previously deselected package po-debconf.
-Unpacking po-debconf (from .../po-debconf_0.9.2_all.deb) ...
+Unpacking po-debconf (from .../po-debconf_1.0_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.24_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.25_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -83,9 +86,9 @@ Setting up html2text (1.3.2a-3) ...
 
 Setting up gettext (0.14.5-2) ...
 
-Setting up intltool-debian (0.34.1+20050828) ...
-Setting up po-debconf (0.9.2) ...
-Setting up debhelper (5.0.24) ...
+Setting up intltool-debian (0.34.1+20060220) ...
+Setting up po-debconf (1.0) ...
+Setting up debhelper (5.0.25) ...
 Setting up libdshconfig1 (0.20.12-1) ...
 
 Setting up libdshconfig1-dev (0.20.12-1) ...
@@ -95,12 +98,12 @@ Building dependency tree...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/97.9kB of archives.
-After unpacking 406kB of additional disk space will be used.
+Need to get 0B/96.2kB of archives.
+After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11939 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
-Setting up fakeroot (1.5.7) ...
+(Reading database ... 11936 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
+Setting up fakeroot (1.5.8) ...
 
 dpkg-buildpackage: source package is dsh
 dpkg-buildpackage: source version is 0.25.6-1
@@ -111,14 +114,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -307,18 +310,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -331,26 +334,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -362,6 +365,7 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
+dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -400,7 +404,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Mar 17 03:05:49 UTC 2006
+Mon Mar 20 03:05:24 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -470,7 +474,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Mar 17 03:05:54 UTC 2006
+Mon Mar 20 03:05:29 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -486,9 +490,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -498,58 +502,58 @@ dh_clean: Compatibility levels before 4 are deprecated.
 dh_installdirs
 dh_installdirs: Compatibility levels before 4 are deprecated.
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -586,8 +590,10 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.6-1_amd64.deb'.
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
+ -> new cache content libdebian-installer4_0.41_amd64.deb added
+ -> new cache content libdebian-installer-extra4_0.41_amd64.deb added
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/28215 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/5652 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index 5c79856..1caebdf 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Mar 17 12:17:28 JST 2006
-pbuilder-time-stamp: 1142565448
+Current time: Mon Mar 20 12:16:59 JST 2006
+pbuilder-time-stamp: 1142824619
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/23267/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/307/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -65,7 +65,7 @@ The following NEW packages will be installed:
 Need to get 0B/2901kB of archives.
 After unpacking 9617kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11257 files and directories currently installed.)
+(Reading database ... 11215 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -105,13 +105,13 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11855 files and directories currently installed.)
+(Reading database ... 11813 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/23267/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/23267/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/307/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/307/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -402,7 +402,6 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
-dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -426,10 +425,10 @@ success
 success
 success
 success
-c: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -441,7 +440,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Mar 17 03:18:12 UTC 2006
+Mon Mar 20 03:17:50 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -454,6 +453,18 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -468,18 +479,6 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -511,14 +510,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Mar 17 03:18:17 UTC 2006
+Mon Mar 20 03:17:55 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-b: b
-c: c
 dsh: Process terminated (before write).
+c: c
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -641,7 +640,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Fri Mar 17 12:18:19 JST 2006
-pbuilder-time-stamp: 1142565499
+Current time: Mon Mar 20 12:17:57 JST 2006
+pbuilder-time-stamp: 1142824677
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/23267 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/307 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sarge.log b/testsuite/normal/pdebuild-normal-sarge.log
index 5b59765..2705878 100644
--- a/testsuite/normal/pdebuild-normal-sarge.log
+++ b/testsuite/normal/pdebuild-normal-sarge.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Mar 17 12:09:11 JST 2006
-pbuilder-time-stamp: 1142564951
+Current time: Mon Mar 20 12:08:40 JST 2006
+pbuilder-time-stamp: 1142824120
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/19024/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/28763/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -115,8 +115,8 @@ Unpacking fakeroot (from .../fakeroot_1.2.10_amd64.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/19024/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/19024/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/28763/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/28763/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -441,7 +441,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Mar 17 03:09:52 UTC 2006
+Mon Mar 20 03:09:18 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -511,14 +511,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Mar 17 03:09:57 UTC 2006
+Mon Mar 20 03:09:23 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 c: c
 dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -624,7 +624,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Fri Mar 17 12:10:03 JST 2006
-pbuilder-time-stamp: 1142565003
+Current time: Mon Mar 20 12:09:25 JST 2006
+pbuilder-time-stamp: 1142824165
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/19024 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/28763 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 9a7b13b..37cdf56 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Mar 17 12:03:51 JST 2006
-pbuilder-time-stamp: 1142564631
+Current time: Mon Mar 20 12:03:31 JST 2006
+pbuilder-time-stamp: 1142823811
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/21380/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/31183/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -62,10 +62,10 @@ The following NEW packages will be installed:
   debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/2917kB of archives.
-After unpacking 9708kB of additional disk space will be used.
+Need to get 0B/2910kB of archives.
+After unpacking 9699kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11244 files and directories currently installed.)
+(Reading database ... 11245 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -74,11 +74,11 @@ Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
 Unpacking gettext (from .../gettext_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package intltool-debian.
-Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
+Unpacking intltool-debian (from .../intltool-debian_0.34.1+20060220_all.deb) ...
 Selecting previously deselected package po-debconf.
-Unpacking po-debconf (from .../po-debconf_0.9.2_all.deb) ...
+Unpacking po-debconf (from .../po-debconf_1.0_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.24_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.25_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -90,9 +90,9 @@ Setting up html2text (1.3.2a-3) ...
 
 Setting up gettext (0.14.5-2) ...
 
-Setting up intltool-debian (0.34.1+20050828) ...
-Setting up po-debconf (0.9.2) ...
-Setting up debhelper (5.0.24) ...
+Setting up intltool-debian (0.34.1+20060220) ...
+Setting up po-debconf (1.0) ...
+Setting up debhelper (5.0.25) ...
 Setting up libdshconfig1 (0.20.12-1) ...
 
 Setting up libdshconfig1-dev (0.20.12-1) ...
@@ -102,16 +102,16 @@ Building dependency tree...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/97.9kB of archives.
-After unpacking 406kB of additional disk space will be used.
+Need to get 0B/96.2kB of archives.
+After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11842 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
-Setting up fakeroot (1.5.7) ...
+(Reading database ... 11839 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
+Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/21380/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/21380/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/31183/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/31183/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -436,11 +436,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-1: 1
 2: 2
+1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Mar 17 03:04:42 UTC 2006
+Mon Mar 20 03:04:25 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -510,13 +510,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Mar 17 03:04:47 UTC 2006
+Mon Mar 20 03:04:30 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
 b: b
+dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -640,7 +640,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Fri Mar 17 12:04:49 JST 2006
-pbuilder-time-stamp: 1142564689
+Current time: Mon Mar 20 12:04:32 JST 2006
+pbuilder-time-stamp: 1142823872
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.f8PsuK/dir3/21380 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hN9dFf/dir3/31183 and its subdirectories
author	dancer <dancer>	2006-03-20 14:33:26 +0000
committer	dancer <dancer>	2006-03-20 14:33:26 +0000
commit	b97db3ab387bd7f26c33f003d5ce142d5b4db111 (patch)
tree	ea5d31e383b03e13177edc98aa1e14bc8d5d9b82 /testsuite/normal
parent	510aaa2fa7dcaac1d43179989398514343bdf3ca (diff)
download	pbuilder-b97db3ab387bd7f26c33f003d5ce142d5b4db111.tar pbuilder-b97db3ab387bd7f26c33f003d5ce142d5b4db111.tar.gz