success, make output changed.

20 files changed, 909 insertions, 903 deletions

diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index f71a556..b3aee90 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Dec 10 13:01:58 JST 2005
-pbuilder-time-stamp: 1134187318
+Current time: Wed Dec 14 12:33:55 JST 2005
+pbuilder-time-stamp: 1134531235
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/23308/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/26733/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -40,7 +40,7 @@ WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package libmagic1.
-(Reading database ... 11791 files and directories currently installed.)
+(Reading database ... 11820 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) ...
@@ -86,17 +86,17 @@ After unpacking 360kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 12382 files and directories currently installed.)
+(Reading database ... 12411 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
 Setting up fakeroot (1.5.5) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/23308/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/23308/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/26733/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/26733/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -403,8 +403,8 @@ success
 success
 success
 a: 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
+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
@@ -417,7 +417,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
-Sat Dec 10 04:03:05 UTC 2005
+Wed Dec 14 03:34:34 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -487,14 +487,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
-Sat Dec 10 04:03:10 UTC 2005
+Wed Dec 14 03:34:39 UTC 2005
 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
@@ -616,7 +616,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: Sat Dec 10 13:03:13 JST 2005
-pbuilder-time-stamp: 1134187393
+Current time: Wed Dec 14 12:34:41 JST 2005
+pbuilder-time-stamp: 1134531281
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/23308 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/26733 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
index 0a584d8..d073743 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Dec 10 12:46:38 JST 2005
-pbuilder-time-stamp: 1134186398
+Current time: Wed Dec 14 12:25:28 JST 2005
+pbuilder-time-stamp: 1134530728
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/1342/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/11577/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.w6uwRC/dir1/1342/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/1342/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/11577/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/11577/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -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
-Sat Dec 10 03:47:49 UTC 2005
+Wed Dec 14 03:26:01 UTC 2005
 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
-Sat Dec 10 03:47:54 UTC 2005
+Wed Dec 14 03:26:06 UTC 2005
 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: Sat Dec 10 12:47:56 JST 2005
-pbuilder-time-stamp: 1134186476
+Current time: Wed Dec 14 12:26:08 JST 2005
+pbuilder-time-stamp: 1134530768
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/1342 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/11577 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index 70d09f8..1b44610 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Dec 10 12:36:53 JST 2005
-pbuilder-time-stamp: 1134185813
+Current time: Wed Dec 14 12:20:17 JST 2005
+pbuilder-time-stamp: 1134530417
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/23187/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/6524/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -40,7 +40,7 @@ WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package libmagic1.
-(Reading database ... 11818 files and directories currently installed.)
+(Reading database ... 11826 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) ...
@@ -55,7 +55,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.1_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.9_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.10_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -71,7 +71,7 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.1) ...
-Setting up debhelper (5.0.9) ...
+Setting up debhelper (5.0.10) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
@@ -86,17 +86,17 @@ After unpacking 360kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 12414 files and directories currently installed.)
+(Reading database ... 12422 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
 Setting up fakeroot (1.5.5) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/23187/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/23187/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/6524/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/6524/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -147,7 +147,7 @@ dpkg-source: building dsh in dsh_0.25.6-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
- ./configure --prefix=/usr --sysconfdir=/etc/dsh --mandir=/usr/share/man
+	 ./configure --prefix=/usr --sysconfdir=/etc/dsh --mandir=/usr/share/man
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
 checking for gawk... no
@@ -336,11 +336,11 @@ make[3]: Nothing to be done for `all'.
 make[3]: Leaving directory `/tmp/buildd/dsh-0.25.6/po'
 make[3]: Entering directory `/tmp/buildd/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
+	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; \
-then mv -f ".deps/dsh-linkedlist.Tpo" ".deps/dsh-linkedlist.Po"; else rm -f ".deps/dsh-linkedlist.Tpo"; exit 1; fi
+	then mv -f ".deps/dsh-linkedlist.Tpo" ".deps/dsh-linkedlist.Po"; else rm -f ".deps/dsh-linkedlist.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-parameter.o -MD -MP -MF ".deps/dsh-parameter.Tpo" -c -o dsh-parameter.o `test -f 'parameter.c' || echo './'`parameter.c; \
-then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
+	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
 gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
@@ -403,9 +403,9 @@ 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
 c: 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
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -417,7 +417,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
-Sat Dec 10 03:38:04 UTC 2005
+Wed Dec 14 03:20:59 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -487,14 +487,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
-Sat Dec 10 03:38:09 UTC 2005
+Wed Dec 14 03:21:04 UTC 2005
 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
@@ -531,14 +531,14 @@ mkdir -p -- /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share
 mkdir -p -- /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
 installing ja.gmo as /tmp/buildd/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` /tmp/buildd/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 \
-		    /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
-  done; \
-else \
-  : ; \
-fi
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/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 \
+			    /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
 make[2]: Leaving directory `/tmp/buildd/dsh-0.25.6/po'
 make[2]: Entering directory `/tmp/buildd/dsh-0.25.6'
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.6'
@@ -548,13 +548,13 @@ install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.6/debian/dsh/usr/b
 test -z "/etc/dsh" || mkdir -p -- . "/tmp/buildd/dsh-0.25.6/debian/dsh/etc/dsh"
  /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
-	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
-	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
-done
+		mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
+			> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
+			> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+	done
 test -z "/usr/share/man/man1" || mkdir -p -- . "/tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/man1"
  /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
 test -z "/usr/share/man/man5" || mkdir -p -- . "/tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/man5"
@@ -616,7 +616,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: Sat Dec 10 12:38:11 JST 2005
-pbuilder-time-stamp: 1134185891
+Current time: Wed Dec 14 12:21:06 JST 2005
+pbuilder-time-stamp: 1134530466
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/23187 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/6524 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index 67aa5b0..3efd098 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.log
@@ -336,13 +336,13 @@ O: 224 files and directories currently installed.)
 O: Unpacking libc6 (from .../libc6_2.3.5-8.1_amd64.deb) ...
 P: Unpacking package libc6
 O: Selecting previously deselected package libgcc1.
-O: Unpacking libgcc1 (from .../libgcc1_4.0.2-2_amd64.deb) ...
+O: Unpacking libgcc1 (from .../libgcc1_4.0.2-5_amd64.deb) ...
 P: Unpacking package libgcc1
 O: Selecting previously deselected package gcc-4.0-base.
-O: Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.2-2_amd64.deb) ...
+O: Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.2-5_amd64.deb) ...
 P: Unpacking package gcc-4.0-base
 O: Selecting previously deselected package libstdc++6.
-O: Unpacking libstdc++6 (from .../libstdc++6_4.0.2-2_amd64.deb) ...
+O: Unpacking libstdc++6 (from .../libstdc++6_4.0.2-5_amd64.deb) ...
 P: Unpacking package libstdc++6
 O: Selecting previously deselected package libattr1.
 O: Unpacking libattr1 (from .../libattr1_2.4.25-1_amd64.deb) ...
@@ -373,11 +373,11 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking debianutils (from .../debianutils_2.15.1_amd64.deb) ...
 P: Unpacking package debianutils
 O: Selecting previously deselected package perl-base.
-O: dpkg: regarding .../perl-base_5.8.7-7_amd64.deb containing perl-base, pre-dependency problem:
+O: dpkg: regarding .../perl-base_5.8.7-9_amd64.deb containing perl-base, pre-dependency problem:
 O:  perl-base pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking perl-base (from .../perl-base_5.8.7-7_amd64.deb) ...
+O: Unpacking perl-base (from .../perl-base_5.8.7-9_amd64.deb) ...
 P: Unpacking package perl-base
 O: Selecting previously deselected package liblocale-gettext-perl.
 O: dpkg: regarding .../liblocale-gettext-perl_1.05-1_amd64.deb containing liblocale-gettext-perl, pre-dependency problem:
@@ -431,7 +431,7 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking ncurses-bin (from .../ncurses-bin_5.5-1_amd64.deb) ...
 P: Unpacking package ncurses-bin
 O: Selecting previously deselected package lsb-base.
-O: Unpacking lsb-base (from .../lsb-base_3.0-11_all.deb) ...
+O: Unpacking lsb-base (from .../lsb-base_3.0-12_all.deb) ...
 P: Unpacking package lsb-base
 O: Selecting previously deselected package zlib1g.
 O: Unpacking zlib1g (from .../zlib1g_1.2.3-8_amd64.deb) ...
@@ -681,7 +681,7 @@ O:
 O: Setting up sysv-rc (2.86.ds1-4) ...
 P: Configuring package sysv-rc
 O: 
-O: Setting up gcc-4.0-base (4.0.2-2) ...
+O: Setting up gcc-4.0-base (4.0.2-5) ...
 P: Configuring package gcc-4.0-base
 O: Setting up libpam-runtime (0.79-3) ...
 P: Configuring package libpam-runtime
@@ -702,7 +702,7 @@ O:
 O: Setting up bsdutils (2.12p-8) ...
 P: Configuring package bsdutils
 O: 
-O: Setting up perl-base (5.8.7-7) ...
+O: Setting up perl-base (5.8.7-9) ...
 P: Configuring package perl-base
 O: Setting up libsepol1 (1.8-1) ...
 P: Configuring package libsepol1
@@ -717,7 +717,7 @@ O:
 O: Setting up slang1a-utf8 (1.4.9dbs-8) ...
 P: Configuring package slang1a-utf8
 O: 
-O: Setting up libgcc1 (4.0.2-2) ...
+O: Setting up libgcc1 (4.0.2-5) ...
 P: Configuring package libgcc1
 O: 
 O: Setting up libtext-iconv-perl (1.4-2) ...
@@ -774,7 +774,7 @@ O:
 O: Setting up util-linux (2.12p-8) ...
 P: Configuring package util-linux
 O: 
-O: Setting up libstdc++6 (4.0.2-2) ...
+O: Setting up libstdc++6 (4.0.2-5) ...
 P: Configuring package libstdc++6
 O: 
 O: Setting up libtext-charwidth-perl (0.04-3) ...
@@ -814,7 +814,7 @@ P: Configuring package dselect
 O: Setting up login (4.0.13-7) ...
 P: Configuring package login
 O: 
-O: Setting up lsb-base (3.0-11) ...
+O: Setting up lsb-base (3.0-12) ...
 P: Configuring package lsb-base
 O: Setting up passwd (4.0.13-7) ...
 P: Configuring package passwd
@@ -843,8 +843,7 @@ O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
-O: (Reading database ... 
-O: 4521 files and directories currently installed.)
+O: (Reading database ... 4521 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-diverts (from .../cdebootstrap-helper-diverts.deb) ...
 O: Adding `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
@@ -867,7 +866,7 @@ O:
 O: Get:1 bootstrap: . Release.gpg [189B]
 O: Get:2 bootstrap: . Release [5902B]
 O: Ign bootstrap: . Release
-O: Fetched 6091B in 0s (52.4kB/s)
+O: Fetched 6091B in 0s (53.8kB/s)
 O: Reading package lists...
 O: 
 O: W: 
@@ -896,7 +895,7 @@ O:   libopencdk8 libpcre3 libpopt0 libsigc++-1.2-5c2 libssl0.9.8 libtasn1-2
 O:   libwrap0 logrotate man-db manpages nano net-tools netbase netkit-inetd nvi
 O:   psmisc sysklogd tasksel tcpd telnet wget whiptail
 O: 0 upgraded, 57 newly installed, 0 to remove and 0 not upgraded.
-O: Need to get 14.7MB of archives.
+O: Need to get 14.8MB of archives.
 O: After unpacking 45.6MB of additional disk space will be used.
 O: WARNING: The following packages cannot be authenticated!
 O:   console-data libconsole console-tools console-common adduser libdb4.2
@@ -914,16 +913,16 @@ O: 4689 files and directories currently installed.)
 O: Unpacking console-data (from .../console-data_2002.12.04dbs-50_all.deb) ...
 P: Unpacking package console-data
 O: Selecting previously deselected package libconsole.
-O: Unpacking libconsole (from .../libconsole_0.2.3dbs-58_amd64.deb) ...
+O: Unpacking libconsole (from .../libconsole_0.2.3dbs-60_amd64.deb) ...
 P: Unpacking package libconsole
 O: Selecting previously deselected package console-tools.
-O: Unpacking console-tools (from .../console-tools_0.2.3dbs-58_amd64.deb) ...
+O: Unpacking console-tools (from .../console-tools_0.2.3dbs-60_amd64.deb) ...
 P: Unpacking package console-tools
 O: Selecting previously deselected package console-common.
 O: Unpacking console-common (from .../console-common_0.7.55_all.deb) ...
 P: Unpacking package console-common
 O: Selecting previously deselected package adduser.
-O: Unpacking adduser (from .../bootstrap/adduser_3.79_all.deb) ...
+O: Unpacking adduser (from .../bootstrap/adduser_3.80_all.deb) ...
 P: Unpacking package adduser
 O: Selecting previously deselected package libdb4.2.
 O: Unpacking libdb4.2 (from .../libdb4.2_4.2.52-18_amd64.deb) ...
@@ -962,7 +961,7 @@ O: Selecting previously deselected package groff-base.
 O: Unpacking groff-base (from .../groff-base_1.18.1.1-10_amd64.deb) ...
 P: Unpacking package groff-base
 O: Selecting previously deselected package net-tools.
-O: Unpacking net-tools (from .../net-tools_1.60-16_amd64.deb) ...
+O: Unpacking net-tools (from .../net-tools_1.60-17_amd64.deb) ...
 P: Unpacking package net-tools
 O: Selecting previously deselected package ifupdown.
 O: Unpacking ifupdown (from .../ifupdown_0.6.7_amd64.deb) ...
@@ -1058,7 +1057,7 @@ O: Selecting previously deselected package libgnutls12.
 O: Unpacking libgnutls12 (from .../libgnutls12_1.2.9-2_amd64.deb) ...
 P: Unpacking package libgnutls12
 O: Selecting previously deselected package libpcre3.
-O: Unpacking libpcre3 (from .../libpcre3_6.4-1_amd64.deb) ...
+O: Unpacking libpcre3 (from .../libpcre3_6.4-1.1_amd64.deb) ...
 P: Unpacking package libpcre3
 O: Selecting previously deselected package exim4-daemon-light.
 O: Unpacking exim4-daemon-light (from .../exim4-daemon-light_4.60-1_amd64.deb) ...
@@ -1081,10 +1080,10 @@ P: Unpacking package dhcp3-client
 O: Selecting previously deselected package psmisc.
 O: Unpacking psmisc (from .../psmisc_21.8-1_amd64.deb) ...
 P: Unpacking package psmisc
-O: Setting up libconsole (0.2.3dbs-58) ...
+O: Setting up libconsole (0.2.3dbs-60) ...
 P: Configuring package libconsole
 O: 
-O: Setting up adduser (3.79) ...
+O: Setting up adduser (3.80) ...
 P: Configuring package adduser
 O: 
 O: Setting up libdb4.2 (4.2.52-18) ...
@@ -1120,7 +1119,7 @@ O:
 O: Setting up groff-base (1.18.1.1-10) ...
 P: Configuring package groff-base
 O: 
-O: Setting up net-tools (1.60-16) ...
+O: Setting up net-tools (1.60-17) ...
 P: Configuring package net-tools
 O: Setting up ifupdown (0.6.7) ...
 P: Configuring package ifupdown
@@ -1221,7 +1220,7 @@ O:
 O: Setting up libgnutls12 (1.2.9-2) ...
 P: Configuring package libgnutls12
 O: 
-O: Setting up libpcre3 (6.4-1) ...
+O: Setting up libpcre3 (6.4-1.1) ...
 P: Configuring package libpcre3
 O: 
 O: Setting up exim4-daemon-light (4.60-1) ...
@@ -1261,7 +1260,7 @@ P: Configuring package console-data
 O: Looking for keymap to install:
 O: NONE
 O: 
-O: Setting up console-tools (0.2.3dbs-58) ...
+O: Setting up console-tools (0.2.3dbs-60) ...
 P: Configuring package console-tools
 O: 
 O: Setting up base-config (2.73) ...
@@ -1269,18 +1268,18 @@ P: Configuring package base-config
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 7433 files and directories currently installed.)
+O: 7444 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 7432 files and directories currently installed.)
+O: 7443 files and directories currently installed.)
 O: Removing cdebootstrap-helper-diverts ...
 O: Purging configuration files for cdebootstrap-helper-diverts ...
 O: Removing `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Removing `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
 P: Deconfiguring helper cdebootstrap-helper-makedev
 O: (Reading database ... 
-O: 7430 files and directories currently installed.)
+O: 7441 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1295,8 +1294,8 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org etch Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org etch Release [5902B]
 Ign http://ftp.jp.debian.org etch Release
-Get:3 http://ftp.jp.debian.org etch/main Packages [3505kB]
-Fetched 3511kB in 2s (1614kB/s)
+Get:3 http://ftp.jp.debian.org etch/main Packages [3523kB]
+Fetched 3529kB in 1s (2049kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org etch 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
@@ -1324,22 +1323,22 @@ The following NEW packages will be installed:
   perl-modules
 0 upgraded, 16 newly installed, 0 to remove and 0 not upgraded.
 Need to get 0B/20.7MB of archives.
-After unpacking 82.3MB of additional disk space will be used.
+After unpacking 82.1MB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   binutils cpp-4.0 cpp perl-modules perl patch make dpkg-dev gcc-4.0 gcc
-  libstdc++6-4.0-dev g++-4.0 g++ linux-kernel-headers libc6-dev
+  linux-kernel-headers libc6-dev libstdc++6-4.0-dev g++-4.0 g++
   build-essential
 Selecting previously deselected package binutils.
-(Reading database ... 7430 files and directories currently installed.)
+(Reading database ... 7441 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20051117-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
-Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-2_amd64.deb) ...
+Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package cpp.
 Unpacking cpp (from .../cpp_4%3a4.0.2-1_amd64.deb) ...
 Selecting previously deselected package perl-modules.
-Unpacking perl-modules (from .../perl-modules_5.8.7-7_all.deb) ...
+Unpacking perl-modules (from .../perl-modules_5.8.7-9_all.deb) ...
 Selecting previously deselected package perl.
-Unpacking perl (from .../perl_5.8.7-7_amd64.deb) ...
+Unpacking perl (from .../perl_5.8.7-9_amd64.deb) ...
 Selecting previously deselected package patch.
 Unpacking patch (from .../patch_2.5.9-2_amd64.deb) ...
 Selecting previously deselected package make.
@@ -1347,45 +1346,45 @@ Unpacking make (from .../make_3.80-11_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
 Unpacking dpkg-dev (from .../dpkg-dev_1.13.11_all.deb) ...
 Selecting previously deselected package gcc-4.0.
-Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-2_amd64.deb) ...
+Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package gcc.
 Unpacking gcc (from .../gcc_4%3a4.0.2-1_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-2_amd64.deb) ...
-Selecting previously deselected package g++-4.0.
-Unpacking g++-4.0 (from .../g++-4.0_4.0.2-2_amd64.deb) ...
-Selecting previously deselected package g++.
-Unpacking g++ (from .../g++_4%3a4.0.2-1_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-8.1_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-5_amd64.deb) ...
+Selecting previously deselected package g++-4.0.
+Unpacking g++-4.0 (from .../g++-4.0_4.0.2-5_amd64.deb) ...
+Selecting previously deselected package g++.
+Unpacking g++ (from .../g++_4%3a4.0.2-1_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.1_amd64.deb) ...
 Setting up binutils (2.16.1cvs20051117-1) ...
 
-Setting up cpp-4.0 (4.0.2-2) ...
+Setting up cpp-4.0 (4.0.2-5) ...
 Setting up cpp (4.0.2-1) ...
 Setting up patch (2.5.9-2) ...
 Setting up make (3.80-11) ...
 
-Setting up gcc-4.0 (4.0.2-2) ...
+Setting up gcc-4.0 (4.0.2-5) ...
 Setting up gcc (4.0.2-1) ...
 
 Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
 Setting up libc6-dev (2.3.5-8.1) ...
-Setting up libstdc++6-4.0-dev (4.0.2-2) ...
-Setting up perl-modules (5.8.7-7) ...
-Setting up g++-4.0 (4.0.2-2) ...
-Setting up g++ (4.0.2-1) ...
-
-Setting up perl (5.8.7-7) ...
+Setting up perl-modules (5.8.7-9) ...
+Setting up libstdc++6-4.0-dev (4.0.2-5) ...
+Setting up perl (5.8.7-9) ...
 
 Setting up dpkg-dev (1.13.11) ...
+Setting up g++-4.0 (4.0.2-5) ...
+Setting up g++ (4.0.2-1) ...
+
 Setting up build-essential (11.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//3250 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//8116 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sarge.log b/testsuite/cdebootstrap/pbuilder-create-sarge.log
index 65a7b93..50c1ef5 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sarge.log
@@ -764,7 +764,8 @@ O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
-O: (Reading database ... 4196 files and directories currently installed.)
+O: (Reading database ... 
+O: 4196 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-diverts (from .../cdebootstrap-helper-diverts.deb) ...
 O: Adding `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
@@ -1217,7 +1218,7 @@ Refreshing the base.tgz
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sarge/main Packages [3223kB]
 Get:2 http://ftp.jp.debian.org sarge/main Release [110B]
-Fetched 3223kB in 1s (1974kB/s)
+Fetched 3223kB in 1s (2101kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -1300,6 +1301,6 @@ Setting up build-essential (10.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//16749 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//27504 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index 3c928b5..40ec617 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -299,8 +299,7 @@ P: Extracting bash
 P: Extracting findutils
 P: Extracting makedev
 O: Selecting previously deselected package base-passwd.
-O: (Reading database ... 
-O: 0 files and directories currently installed.)
+O: (Reading database ... 0 files and directories currently installed.)
 O: Unpacking base-passwd (from .../base-passwd_3.5.10_amd64.deb) ...
 P: Unpacking package base-passwd
 O: dpkg: base-passwd: dependency problems, but configuring anyway as you request:
@@ -310,13 +309,12 @@ O: Setting up base-passwd (3.5.10) ...
 P: Configuring package base-passwd
 O: 
 O: Selecting previously deselected package dpkg.
+O: (Reading database ... 21 files and directories currently installed.)
+O: Unpacking dpkg (from .../dpkg_1.13.11_amd64.deb) ...
+P: Unpacking package dpkg
 O: dpkg: regarding .../dpkg_1.13.11_amd64.deb containing dpkg, pre-dependency problem:
 O:  dpkg pre-depends on libc6 (>= 2.3.5-1)
 O: dpkg: warning - ignoring pre-dependency problem !
-O: (Reading database ... 
-O: 21 files and directories currently installed.)
-O: Unpacking dpkg (from .../dpkg_1.13.11_amd64.deb) ...
-P: Unpacking package dpkg
 O: dpkg: dpkg: dependency problems, but configuring anyway as you request:
 O:  dpkg depends on libc6 (>= 2.3.5-1); however:
 O:   Package libc6 is not installed.
@@ -370,22 +368,22 @@ P: Unpacking package coreutils
 O: No diversion `any diversion of /usr/share/man/man1/md5sum.textutils.1.gz', none removed
 O: No diversion `any diversion of /usr/bin/md5sum.textutils', none removed
 O: Selecting previously deselected package debianutils.
-O: dpkg: regarding .../debianutils_2.15.1_amd64.deb containing debianutils, pre-dependency problem:
+O: dpkg: regarding .../debianutils_2.15.2_amd64.deb containing debianutils, pre-dependency problem:
 O:  debianutils pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../debianutils_2.15.1_amd64.deb containing debianutils, pre-dependency problem:
+O: dpkg: regarding .../debianutils_2.15.2_amd64.deb containing debianutils, pre-dependency problem:
 O:  debianutils pre-depends on coreutils (>= 4.5.8-1)
 O:   coreutils is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking debianutils (from .../debianutils_2.15.1_amd64.deb) ...
+O: Unpacking debianutils (from .../debianutils_2.15.2_amd64.deb) ...
 P: Unpacking package debianutils
 O: Selecting previously deselected package perl-base.
-O: dpkg: regarding .../perl-base_5.8.7-8_amd64.deb containing perl-base, pre-dependency problem:
+O: dpkg: regarding .../perl-base_5.8.7-9_amd64.deb containing perl-base, pre-dependency problem:
 O:  perl-base pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking perl-base (from .../perl-base_5.8.7-8_amd64.deb) ...
+O: Unpacking perl-base (from .../perl-base_5.8.7-9_amd64.deb) ...
 P: Unpacking package perl-base
 O: Selecting previously deselected package liblocale-gettext-perl.
 O: dpkg: regarding .../liblocale-gettext-perl_1.05-1_amd64.deb containing liblocale-gettext-perl, pre-dependency problem:
@@ -418,11 +416,11 @@ O: Selecting previously deselected package debconf-i18n.
 O: Unpacking debconf-i18n (from .../debconf-i18n_1.4.62_all.deb) ...
 P: Unpacking package debconf-i18n
 O: Selecting previously deselected package sed.
-O: dpkg: regarding .../sed_4.1.4-4_amd64.deb containing sed, pre-dependency problem:
+O: dpkg: regarding .../sed_4.1.4-5_amd64.deb containing sed, pre-dependency problem:
 O:  sed pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking sed (from .../sed_4.1.4-4_amd64.deb) ...
+O: Unpacking sed (from .../sed_4.1.4-5_amd64.deb) ...
 P: Unpacking package sed
 O: Selecting previously deselected package libncurses5.
 O: Unpacking libncurses5 (from .../libncurses5_5.5-1_amd64.deb) ...
@@ -445,11 +443,11 @@ O: Selecting previously deselected package zlib1g.
 O: Unpacking zlib1g (from .../zlib1g_1.2.3-8_amd64.deb) ...
 P: Unpacking package zlib1g
 O: Selecting previously deselected package bsdutils.
-O: dpkg: regarding .../bsdutils_2.12r-1_amd64.deb containing bsdutils, pre-dependency problem:
+O: dpkg: regarding .../bsdutils_2.12r-2_amd64.deb containing bsdutils, pre-dependency problem:
 O:  bsdutils pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking bsdutils (from .../bsdutils_2.12r-1_amd64.deb) ...
+O: Unpacking bsdutils (from .../bsdutils_2.12r-2_amd64.deb) ...
 P: Unpacking package bsdutils
 O: Selecting previously deselected package libpam-runtime.
 O: Unpacking libpam-runtime (from .../libpam-runtime_0.79-3_all.deb) ...
@@ -491,69 +489,69 @@ O: Selecting previously deselected package libsepol1.
 O: Unpacking libsepol1 (from .../libsepol1_1.8-1_amd64.deb) ...
 P: Unpacking package libsepol1
 O: Selecting previously deselected package libuuid1.
-O: Unpacking libuuid1 (from .../libuuid1_1.38-2_amd64.deb) ...
+O: Unpacking libuuid1 (from .../libuuid1_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
 P: Unpacking package libuuid1
 O: Selecting previously deselected package util-linux.
-O: dpkg: regarding .../util-linux_2.12r-1_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-2_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../util-linux_2.12r-1_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-2_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on libncurses5 (>= 5.4-5)
 O:   libncurses5 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../util-linux_2.12r-1_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-2_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on libslang2 (>= 2.0.1-1)
 O:   libslang2 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../util-linux_2.12r-1_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-2_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on libuuid1
 O:   libuuid1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../util-linux_2.12r-1_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-2_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on zlib1g (>= 1:1.2.1)
 O:   zlib1g is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking util-linux (from .../util-linux_2.12r-1_amd64.deb) ...
+O: Unpacking util-linux (from .../util-linux_2.12r-2_amd64.deb) ...
 P: Unpacking package util-linux
 O: Selecting previously deselected package e2fslibs.
-O: Unpacking e2fslibs (from .../e2fslibs_1.38-2_amd64.deb) ...
+O: Unpacking e2fslibs (from .../e2fslibs_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
 P: Unpacking package e2fslibs
 O: Selecting previously deselected package libblkid1.
-O: Unpacking libblkid1 (from .../libblkid1_1.38-2_amd64.deb) ...
+O: Unpacking libblkid1 (from .../libblkid1_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
 P: Unpacking package libblkid1
 O: Selecting previously deselected package libcomerr2.
-O: Unpacking libcomerr2 (from .../libcomerr2_1.38-2_amd64.deb) ...
+O: Unpacking libcomerr2 (from .../libcomerr2_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
 P: Unpacking package libcomerr2
 O: Selecting previously deselected package libss2.
-O: Unpacking libss2 (from .../libss2_1.38-2_amd64.deb) ...
+O: Unpacking libss2 (from .../libss2_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
 P: Unpacking package libss2
 O: Selecting previously deselected package e2fsprogs.
-O: dpkg: regarding .../e2fsprogs_1.38-2_amd64.deb containing e2fsprogs, pre-dependency problem:
-O:  e2fsprogs pre-depends on e2fslibs (= 1.38-2)
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2005.12.10-1_amd64.deb containing e2fsprogs, pre-dependency problem:
+O:  e2fsprogs pre-depends on e2fslibs (= 1.38+1.39-WIP-2005.12.10-1)
 O:   e2fslibs is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../e2fsprogs_1.38-2_amd64.deb containing e2fsprogs, pre-dependency problem:
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2005.12.10-1_amd64.deb containing e2fsprogs, pre-dependency problem:
 O:  e2fsprogs pre-depends on libblkid1 (>= 1.34-1)
 O:   libblkid1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../e2fsprogs_1.38-2_amd64.deb containing e2fsprogs, pre-dependency problem:
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2005.12.10-1_amd64.deb containing e2fsprogs, pre-dependency problem:
 O:  e2fsprogs pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../e2fsprogs_1.38-2_amd64.deb containing e2fsprogs, pre-dependency problem:
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2005.12.10-1_amd64.deb containing e2fsprogs, pre-dependency problem:
 O:  e2fsprogs pre-depends on libcomerr2 (>= 1.34-1)
 O:   libcomerr2 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../e2fsprogs_1.38-2_amd64.deb containing e2fsprogs, pre-dependency problem:
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2005.12.10-1_amd64.deb containing e2fsprogs, pre-dependency problem:
 O:  e2fsprogs pre-depends on libss2 (>= 1.34-1)
 O:   libss2 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../e2fsprogs_1.38-2_amd64.deb containing e2fsprogs, pre-dependency problem:
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2005.12.10-1_amd64.deb containing e2fsprogs, pre-dependency problem:
 O:  e2fsprogs pre-depends on libuuid1 (>= 1.34-1)
 O:   libuuid1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking e2fsprogs (from .../e2fsprogs_1.38-2_amd64.deb) ...
+O: Unpacking e2fsprogs (from .../e2fsprogs_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
 P: Unpacking package e2fsprogs
 O: Selecting previously deselected package initscripts.
 O: Unpacking initscripts (from .../initscripts_2.86.ds1-6_amd64.deb) ...
@@ -639,30 +637,30 @@ O: Selecting previously deselected package base-files.
 O: Unpacking base-files (from .../base-files_3.1.9_amd64.deb) ...
 P: Unpacking package base-files
 O: Selecting previously deselected package mount.
-O: dpkg: regarding .../mount_2.12r-1_amd64.deb containing mount, pre-dependency problem:
+O: dpkg: regarding .../mount_2.12r-2_amd64.deb containing mount, pre-dependency problem:
 O:  mount pre-depends on libblkid1 (>= 1.37-1)
 O:   libblkid1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../mount_2.12r-1_amd64.deb containing mount, pre-dependency problem:
+O: dpkg: regarding .../mount_2.12r-2_amd64.deb containing mount, pre-dependency problem:
 O:  mount pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../mount_2.12r-1_amd64.deb containing mount, pre-dependency problem:
+O: dpkg: regarding .../mount_2.12r-2_amd64.deb containing mount, pre-dependency problem:
 O:  mount pre-depends on libuuid1
 O:   libuuid1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking mount (from .../mount_2.12r-1_amd64.deb) ...
+O: Unpacking mount (from .../mount_2.12r-2_amd64.deb) ...
 P: Unpacking package mount
 O: Selecting previously deselected package bash.
-O: dpkg: regarding .../bash_3.0-17_amd64.deb containing bash, pre-dependency problem:
+O: dpkg: regarding .../bootstrap/bash_3.1-1_amd64.deb containing bash, pre-dependency problem:
 O:  bash pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../bash_3.0-17_amd64.deb containing bash, pre-dependency problem:
+O: dpkg: regarding .../bootstrap/bash_3.1-1_amd64.deb containing bash, pre-dependency problem:
 O:  bash pre-depends on libncurses5 (>= 5.4-5)
 O:   libncurses5 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking bash (from .../bash_3.0-17_amd64.deb) ...
+O: Unpacking bash (from .../bootstrap/bash_3.1-1_amd64.deb) ...
 P: Unpacking package bash
 O: Selecting previously deselected package findutils.
 O: dpkg: regarding .../findutils_4.2.26-2_amd64.deb containing findutils, pre-dependency problem:
@@ -692,16 +690,16 @@ O:
 O: Setting up libcap1 (1.10-14) ...
 P: Configuring package libcap1
 O: 
-O: Setting up libuuid1 (1.38-2) ...
+O: Setting up libuuid1 (1.38+1.39-WIP-2005.12.10-1) ...
 P: Configuring package libuuid1
 O: 
 O: Setting up libpam0g (0.79-3) ...
 P: Configuring package libpam0g
 O: 
-O: Setting up bsdutils (2.12r-1) ...
+O: Setting up bsdutils (2.12r-2) ...
 P: Configuring package bsdutils
 O: 
-O: Setting up perl-base (5.8.7-8) ...
+O: Setting up perl-base (5.8.7-9) ...
 P: Configuring package perl-base
 O: Setting up libsepol1 (1.8-1) ...
 P: Configuring package libsepol1
@@ -724,13 +722,13 @@ O:
 O: Setting up libattr1 (2.4.25-1) ...
 P: Configuring package libattr1
 O: 
-O: Setting up sed (4.1.4-4) ...
+O: Setting up sed (4.1.4-5) ...
 P: Configuring package sed
 O: 
-O: Setting up e2fslibs (1.38-2) ...
+O: Setting up e2fslibs (1.38+1.39-WIP-2005.12.10-1) ...
 P: Configuring package e2fslibs
 O: 
-O: Setting up libcomerr2 (1.38-2) ...
+O: Setting up libcomerr2 (1.38+1.39-WIP-2005.12.10-1) ...
 P: Configuring package libcomerr2
 O: 
 O: Setting up mawk (1.3.3-11) ...
@@ -749,16 +747,16 @@ O:
 O: Setting up libslang2 (2.0.5-1) ...
 P: Configuring package libslang2
 O: 
-O: Setting up libblkid1 (1.38-2) ...
+O: Setting up libblkid1 (1.38+1.39-WIP-2005.12.10-1) ...
 P: Configuring package libblkid1
 O: 
-O: Setting up libss2 (1.38-2) ...
+O: Setting up libss2 (1.38+1.39-WIP-2005.12.10-1) ...
 P: Configuring package libss2
 O: 
 O: Setting up findutils (4.2.26-2) ...
 P: Configuring package findutils
 O: 
-O: Setting up e2fsprogs (1.38-2) ...
+O: Setting up e2fsprogs (1.38+1.39-WIP-2005.12.10-1) ...
 P: Configuring package e2fsprogs
 O: Setting up liblocale-gettext-perl (1.05-1) ...
 P: Configuring package liblocale-gettext-perl
@@ -767,7 +765,7 @@ P: Configuring package diff
 O: Setting up libselinux1 (1.26-1) ...
 P: Configuring package libselinux1
 O: 
-O: Setting up util-linux (2.12r-1) ...
+O: Setting up util-linux (2.12r-2) ...
 P: Configuring package util-linux
 O: 
 O: Setting up libstdc++6 (4.0.2-5) ...
@@ -780,7 +778,7 @@ P: Configuring package libtext-wrapi18n-perl
 O: Setting up coreutils (5.93-5) ...
 P: Configuring package coreutils
 O: 
-O: Setting up debianutils (2.15.1) ...
+O: Setting up debianutils (2.15.2) ...
 P: Configuring package debianutils
 O: 
 O: Setting up procps (3.2.6-2) ...
@@ -796,7 +794,7 @@ O:
 O: Setting up base-files (3.1.9) ...
 P: Configuring package base-files
 O: 
-O: Setting up mount (2.12r-1) ...
+O: Setting up mount (2.12r-2) ...
 P: Configuring package mount
 O: 
 O: Setting up libnewt0.51 (0.51.6-31) ...
@@ -807,6 +805,9 @@ P: Configuring package gzip
 O: 
 O: Setting up dselect (1.13.11) ...
 P: Configuring package dselect
+O: Setting up bash (3.1-1) ...
+P: Configuring package bash
+O: 
 O: Setting up login (4.0.13-7) ...
 P: Configuring package login
 O: 
@@ -818,9 +819,6 @@ O:
 O: Setting up initscripts (2.86.ds1-6) ...
 P: Configuring package initscripts
 O: 
-O: Setting up bash (3.0-17) ...
-P: Configuring package bash
-O: 
 O: Setting up sysvinit (2.86.ds1-6) ...
 P: Configuring package sysvinit
 O: sysvinit: creating /dev/initctl
@@ -834,14 +832,13 @@ P: Configuring package debconf
 O: 
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
-O: (Reading database ... 
-O: 4525 files and directories currently installed.)
+O: (Reading database ... 4527 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
 O: (Reading database ... 
-O: 4528 files and directories currently installed.)
+O: 4530 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-diverts (from .../cdebootstrap-helper-diverts.deb) ...
 O: Adding `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
@@ -849,13 +846,13 @@ O: Setting up cdebootstrap-helper-diverts (1) ...
 P: Configuring helper cdebootstrap-helper-makedev
 O: Selecting previously deselected package cdebootstrap-helper-makedev.
 O: (Reading database ... 
-O: 4530 files and directories currently installed.)
+O: 4532 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.deb) ...
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
 O: Selecting previously deselected package apt.
 O: (Reading database ... 
-O: 4530 files and directories currently installed.)
+O: 4532 files and directories currently installed.)
 O: Unpacking apt (from .../bootstrap/apt_0.6.43_amd64.deb) ...
 P: Unpacking package apt
 O: Setting up apt (0.6.43) ...
@@ -874,6 +871,7 @@ O: W:
 O: You may want to run apt-get update to correct these problems
 O: 
 O: Reading package lists...
+O: 
 O: Building dependency tree...
 O: 
 O: Suggested packages:
@@ -893,8 +891,8 @@ O:   libopencdk8 libpcre3 libpopt0 libsigc++-2.0-0c2a libssl0.9.8 libtasn1-2
 O:   libwrap0 logrotate man-db manpages nano net-tools netbase netkit-inetd nvi
 O:   psmisc sysklogd tasksel tcpd telnet wget whiptail
 O: 0 upgraded, 57 newly installed, 0 to remove and 0 not upgraded.
-O: Need to get 15.2MB of archives.
-O: After unpacking 47.0MB of additional disk space will be used.
+O: Need to get 15.4MB of archives.
+O: After unpacking 47.5MB of additional disk space will be used.
 O: WARNING: The following packages cannot be authenticated!
 O:   console-data libconsole console-tools console-common adduser apt-utils
 O:   libncursesw5 libsigc++-2.0-0c2a aptitude gettext-base base-config
@@ -907,7 +905,7 @@ O:   exim4-daemon-light at exim4 telnet dhcp3-common dhcp3-client psmisc
 O: Authentication warning overridden.
 O: Selecting previously deselected package console-data.
 O: (Reading database ... 
-O: 4696 files and directories currently installed.)
+O: 4698 files and directories currently installed.)
 O: Unpacking console-data (from .../console-data_2002.12.04dbs-52_all.deb) ...
 P: Unpacking package console-data
 O: Selecting previously deselected package libconsole.
@@ -932,7 +930,7 @@ O: Selecting previously deselected package libsigc++-2.0-0c2a.
 O: Unpacking libsigc++-2.0-0c2a (from .../libsigc++-2.0-0c2a_2.0.16-2_amd64.deb) ...
 P: Unpacking package libsigc++-2.0-0c2a
 O: Selecting previously deselected package aptitude.
-O: Unpacking aptitude (from .../aptitude_0.4.0-5_amd64.deb) ...
+O: Unpacking aptitude (from .../aptitude_0.4.1-1_amd64.deb) ...
 P: Unpacking package aptitude
 O: Selecting previously deselected package gettext-base.
 O: Unpacking gettext-base (from .../gettext-base_0.14.5-2_amd64.deb) ...
@@ -1016,7 +1014,7 @@ O: Selecting previously deselected package man-db.
 O: Unpacking man-db (from .../man-db_2.4.3-3_amd64.deb) ...
 P: Unpacking package man-db
 O: Selecting previously deselected package manpages.
-O: Unpacking manpages (from .../manpages_2.13-1_all.deb) ...
+O: Unpacking manpages (from .../manpages_2.16-1_all.deb) ...
 P: Unpacking package manpages
 O: Selecting previously deselected package nano.
 O: Unpacking nano (from .../nano_1.3.9-1_amd64.deb) ...
@@ -1043,7 +1041,7 @@ O: Selecting previously deselected package whiptail.
 O: Unpacking whiptail (from .../whiptail_0.51.6-31_amd64.deb) ...
 P: Unpacking package whiptail
 O: Selecting previously deselected package libdb4.2.
-O: Unpacking libdb4.2 (from .../libdb4.2_4.2.52-20_amd64.deb) ...
+O: Unpacking libdb4.2 (from .../libdb4.2_4.2.52-21_amd64.deb) ...
 P: Unpacking package libdb4.2
 O: Selecting previously deselected package exim4-config.
 O: Unpacking exim4-config (from .../exim4-config_4.60-1_all.deb) ...
@@ -1098,7 +1096,7 @@ O:
 O: Setting up libsigc++-2.0-0c2a (2.0.16-2) ...
 P: Configuring package libsigc++-2.0-0c2a
 O: 
-O: Setting up aptitude (0.4.0-5) ...
+O: Setting up aptitude (0.4.1-1) ...
 P: Configuring package aptitude
 O: 
 O: Setting up gettext-base (0.14.5-2) ...
@@ -1176,7 +1174,7 @@ O: Setting up man-db (2.4.3-3) ...
 P: Configuring package man-db
 O: Building database of manual pages ...
 O: 
-O: Setting up manpages (2.13-1) ...
+O: Setting up manpages (2.16-1) ...
 P: Configuring package manpages
 O: Setting up nano (1.3.9-1) ...
 P: Configuring package nano
@@ -1204,7 +1202,7 @@ P: Configuring package wget
 O: 
 O: Setting up whiptail (0.51.6-31) ...
 P: Configuring package whiptail
-O: Setting up libdb4.2 (4.2.52-20) ...
+O: Setting up libdb4.2 (4.2.52-21) ...
 P: Configuring package libdb4.2
 O: Setting up exim4-config (4.60-1) ...
 P: Configuring package exim4-config
@@ -1266,18 +1264,18 @@ O: NONE
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 7442 files and directories currently installed.)
+O: 7444 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 7441 files and directories currently installed.)
+O: 7443 files and directories currently installed.)
 O: Removing cdebootstrap-helper-diverts ...
 O: Purging configuration files for cdebootstrap-helper-diverts ...
 O: Removing `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Removing `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
 P: Deconfiguring helper cdebootstrap-helper-makedev
 O: (Reading database ... 
-O: 7439 files and directories currently installed.)
+O: 7441 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1292,8 +1290,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 [5722B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3812kB]
-Fetched 3818kB in 1s (1939kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3818kB]
+Fetched 3824kB in 1s (1985kB/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
@@ -1320,33 +1318,33 @@ The following NEW packages will be installed:
   libc6-dev libstdc++6-4.0-dev linux-kernel-headers make patch perl
   perl-modules
 0 upgraded, 16 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/20.7MB of archives.
-After unpacking 82.5MB of additional disk space will be used.
+Need to get 0B/20.8MB of archives.
+After unpacking 82.4MB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   binutils cpp-4.0 cpp perl-modules perl patch make dpkg-dev gcc-4.0 gcc
   linux-kernel-headers libc6-dev libstdc++6-4.0-dev g++-4.0 g++
   build-essential
 Selecting previously deselected package binutils.
-(Reading database ... 7439 files and directories currently installed.)
-Unpacking binutils (from .../binutils_2.16.1cvs20051117-1_amd64.deb) ...
+(Reading database ... 7441 files and directories currently installed.)
+Unpacking binutils (from .../binutils_2.16.1cvs20051206-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package cpp.
-Unpacking cpp (from .../cpp_4%3a4.0.2-1_amd64.deb) ...
+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.7-8_all.deb) ...
+Unpacking perl-modules (from .../perl-modules_5.8.7-9_all.deb) ...
 Selecting previously deselected package perl.
-Unpacking perl (from .../perl_5.8.7-8_amd64.deb) ...
+Unpacking perl (from .../perl_5.8.7-9_amd64.deb) ...
 Selecting previously deselected package patch.
 Unpacking patch (from .../patch_2.5.9-2_amd64.deb) ...
 Selecting previously deselected package make.
-Unpacking make (from .../make_3.80-12_amd64.deb) ...
+Unpacking make (from .../make_3.80+3.81.b3-1_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
 Unpacking dpkg-dev (from .../dpkg-dev_1.13.11_all.deb) ...
 Selecting previously deselected package gcc-4.0.
 Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package gcc.
-Unpacking gcc (from .../gcc_4%3a4.0.2-1_amd64.deb) ...
+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.
@@ -1356,33 +1354,34 @@ Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package g++-4.0.
 Unpacking g++-4.0 (from .../g++-4.0_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package g++.
-Unpacking g++ (from .../g++_4%3a4.0.2-1_amd64.deb) ...
+Unpacking g++ (from .../g++_4%3a4.0.2-2_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.1_amd64.deb) ...
-Setting up binutils (2.16.1cvs20051117-1) ...
+Setting up binutils (2.16.1cvs20051206-1) ...
 
 Setting up cpp-4.0 (4.0.2-5) ...
-Setting up cpp (4.0.2-1) ...
+Setting up cpp (4.0.2-2) ...
+
 Setting up patch (2.5.9-2) ...
-Setting up make (3.80-12) ...
+Setting up make (3.80+3.81.b3-1) ...
 
 Setting up gcc-4.0 (4.0.2-5) ...
-Setting up gcc (4.0.2-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-8.1) ...
-Setting up perl-modules (5.8.7-8) ...
+Setting up perl-modules (5.8.7-9) ...
 Setting up libstdc++6-4.0-dev (4.0.2-5) ...
-Setting up perl (5.8.7-8) ...
+Setting up perl (5.8.7-9) ...
 
 Setting up dpkg-dev (1.13.11) ...
 Setting up g++-4.0 (4.0.2-5) ...
-Setting up g++ (4.0.2-1) ...
+Setting up g++ (4.0.2-2) ...
 
 Setting up build-essential (11.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//3270 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//20257 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-etch.log b/testsuite/cdebootstrap/pbuilder-execute-etch.log
index f8af040..671f3f1 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-etch.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//13730/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//14548/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//13730 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//14548 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sarge.log b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
index 679439e..45dfc02 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//24164/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//31695/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//24164 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//31695 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sid.log b/testsuite/cdebootstrap/pbuilder-execute-sid.log
index 4b9180c..fa83125 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-sid.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//15281/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//26675/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//15281 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//26675 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
index 658f105..5dde6ca 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/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.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//17422/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//16945/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -18,8 +18,8 @@ Ign http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org ../project/experimental Release [4245B]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [115kB]
-Fetched 120kB in 0s (293kB/s)
+Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [121kB]
+Fetched 126kB in 0s (781kB/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: GPG error: http://ftp.jp.debian.org ../project/experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -30,21 +30,36 @@ Reading package lists...
 Building dependency tree...
 The following packages will be REMOVED:
   aptitude tasksel
+The following NEW packages will be installed:
+  gcc-4.1-base
 The following packages will be upgraded:
-  apt apt-utils diff
-3 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
-Need to get 0B/1679kB of archives.
-After unpacking 8610kB disk space will be freed.
+  apt apt-utils diff libgcc1 libstdc++6
+5 upgraded, 1 newly installed, 2 to remove and 0 not upgraded.
+Need to get 0B/2253kB of archives.
+After unpacking 8958kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
-  diff apt-utils apt
-(Reading database ... 11835 files and directories currently installed.)
+  diff gcc-4.1-base libgcc1 libstdc++6 apt-utils apt
+(Reading database ... 11843 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 11644 files and directories currently installed.)
+(Reading database ... 11652 files and directories currently installed.)
 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) ...
-(Reading database ... 11652 files and directories currently installed.)
+Selecting previously deselected package gcc-4.1-base.
+(Reading database ... 11660 files and directories currently installed.)
+Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1-0exp4_amd64.deb) ...
+Preparing to replace libgcc1 1:4.0.2-5 (using .../libgcc1_1%3a4.1-0exp4_amd64.deb) ...
+Unpacking replacement libgcc1 ...
+Setting up gcc-4.1-base (4.1-0exp4) ...
+Setting up libgcc1 (4.1-0exp4) ...
+
+(Reading database ... 11666 files and directories currently installed.)
+Preparing to replace libstdc++6 4.0.2-5 (using .../libstdc++6_4.1-0exp4_amd64.deb) ...
+Unpacking replacement libstdc++6 ...
+Setting up libstdc++6 (4.1-0exp4) ...
+
+(Reading database ... 11663 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43 (using .../apt-utils_0.6.43exp2_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43 (using .../apt_0.6.43exp2_amd64.deb) ...
@@ -62,6 +77,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//17422 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16945 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index 1300775..710fd61 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
+++ b/testsuite/cdebootstrap/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.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//15202/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//15377/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 [5722B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3812kB]
-Fetched 3818kB in 2s (1643kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3818kB]
+Fetched 3824kB in 1s (2101kB/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
@@ -25,115 +25,101 @@ Building dependency tree...
 The following NEW packages will be installed:
   libsigc++-2.0-0c2a
 The following packages will be upgraded:
-  adduser apt apt-utils aptitude base-config bsdutils console-data
-  console-tools coreutils cpp-4.0 debconf debconf-i18n findutils g++-4.0
-  gcc-4.0 gcc-4.0-base initscripts libacl1 libconsole libdb4.2 libdb4.3
-  libgcc1 libpcre3 libssl0.9.8 libstdc++6 libstdc++6-4.0-dev lsb-base make
-  manpages mount nano net-tools perl perl-base perl-modules procps sed sysv-rc
-  sysvinit tasksel util-linux
-41 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/29.1MB of archives.
-After unpacking 2445kB of additional disk space will be used.
+  apt apt-utils aptitude base-config bash binutils bsdutils console-data
+  coreutils cpp debconf debconf-i18n debianutils e2fslibs e2fsprogs findutils
+  g++ gcc initscripts libacl1 libblkid1 libcomerr2 libdb4.2 libdb4.3 libss2
+  libssl0.9.8 libuuid1 make manpages mount nano procps sed sysv-rc sysvinit
+  tasksel util-linux
+37 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/18.0MB of archives.
+After unpacking 3133kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  bsdutils coreutils findutils mount perl-modules libdb4.3 perl perl-base sed
-  sysvinit util-linux debconf-i18n debconf libstdc++6-4.0-dev g++-4.0 gcc-4.0
-  cpp-4.0 libgcc1 gcc-4.0-base libstdc++6 apt-utils libsigc++-2.0-0c2a
-  aptitude apt lsb-base initscripts libacl1 sysv-rc adduser console-data
-  console-tools libconsole base-config libssl0.9.8 manpages nano net-tools
-  tasksel procps libpcre3 make libdb4.2
-(Reading database ... 11791 files and directories currently installed.)
-Preparing to replace bsdutils 1:2.12p-8 (using .../bsdutils_1%3a2.12r-1_amd64.deb) ...
+  debianutils bash bsdutils coreutils e2fslibs e2fsprogs findutils mount sed
+  sysvinit util-linux debconf-i18n debconf libdb4.3 apt-utils
+  libsigc++-2.0-0c2a aptitude apt initscripts libacl1 libblkid1 libcomerr2
+  libss2 libuuid1 sysv-rc console-data base-config libssl0.9.8 manpages nano
+  tasksel procps binutils cpp gcc g++ make libdb4.2
+(Reading database ... 11820 files and directories currently installed.)
+Preparing to replace debianutils 2.15.1 (using .../debianutils_2.15.2_amd64.deb) ...
+Unpacking replacement debianutils ...
+Setting up debianutils (2.15.2) ...
+
+(Reading database ... 11822 files and directories currently installed.)
+Preparing to replace bash 3.0-17 (using .../archives/bash_3.1-1_amd64.deb) ...
+Unpacking replacement bash ...
+Setting up bash (3.1-1) ...
+Installing new version of config file /etc/bash_completion ...
+
+(Reading database ... 11822 files and directories currently installed.)
+Preparing to replace bsdutils 1:2.12p-8 (using .../bsdutils_1%3a2.12r-2_amd64.deb) ...
 Unpacking replacement bsdutils ...
-Setting up bsdutils (2.12r-1) ...
+Setting up bsdutils (2.12r-2) ...
 
-(Reading database ... 11791 files and directories currently installed.)
+(Reading database ... 11822 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.93-5_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.93-5) ...
 
-(Reading database ... 11805 files and directories currently installed.)
+(Reading database ... 11836 files and directories currently installed.)
+Preparing to replace e2fslibs 1.38-2 (using .../e2fslibs_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement e2fslibs ...
+Setting up e2fslibs (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 11836 files and directories currently installed.)
+Preparing to replace e2fsprogs 1.38-2 (using .../e2fsprogs_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement e2fsprogs ...
+Setting up e2fsprogs (1.38+1.39-WIP-2005.12.10-1) ...
+(Reading database ... 11836 files and directories currently installed.)
 Preparing to replace findutils 4.2.25-1 (using .../findutils_4.2.26-2_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.26-2) ...
 Installing new version of config file /etc/updatedb.conf ...
 
-(Reading database ... 11806 files and directories currently installed.)
-Preparing to replace mount 2.12p-8 (using .../mount_2.12r-1_amd64.deb) ...
+(Reading database ... 11837 files and directories currently installed.)
+Preparing to replace mount 2.12p-8 (using .../mount_2.12r-2_amd64.deb) ...
 Unpacking replacement mount ...
-Setting up mount (2.12r-1) ...
+Setting up mount (2.12r-2) ...
 
-(Reading database ... 11806 files and directories currently installed.)
-Preparing to replace perl-modules 5.8.7-7 (using .../perl-modules_5.8.7-8_all.deb) ...
-Unpacking replacement perl-modules ...
-Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
-Unpacking replacement libdb4.3 ...
-Preparing to replace perl 5.8.7-7 (using .../perl_5.8.7-8_amd64.deb) ...
-Unpacking replacement perl ...
-Preparing to replace perl-base 5.8.7-7 (using .../perl-base_5.8.7-8_amd64.deb) ...
-Unpacking replacement perl-base ...
-Setting up perl-base (5.8.7-8) ...
-(Reading database ... 11804 files and directories currently installed.)
-Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
+(Reading database ... 11837 files and directories currently installed.)
+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-4) ...
+Setting up sed (4.1.4-5) ...
 
-(Reading database ... 11805 files and directories currently installed.)
+(Reading database ... 11838 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-4 (using .../sysvinit_2.86.ds1-6_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-6) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11805 files and directories currently installed.)
-Preparing to replace util-linux 2.12p-8 (using .../util-linux_2.12r-1_amd64.deb) ...
+(Reading database ... 11838 files and directories currently installed.)
+Preparing to replace util-linux 2.12p-8 (using .../util-linux_2.12r-2_amd64.deb) ...
 Unpacking replacement util-linux ...
-Setting up util-linux (2.12r-1) ...
+Setting up util-linux (2.12r-2) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11805 files and directories currently installed.)
+(Reading database ... 11838 files and directories currently installed.)
 Preparing to replace debconf-i18n 1.4.59 (using .../debconf-i18n_1.4.62_all.deb) ...
 Unpacking replacement debconf-i18n ...
 Preparing to replace debconf 1.4.59 (using .../debconf_1.4.62_all.deb) ...
 Unpacking replacement debconf ...
-Preparing to replace libstdc++6-4.0-dev 4.0.2-2 (using .../libstdc++6-4.0-dev_4.0.2-5_amd64.deb) ...
-Unpacking replacement libstdc++6-4.0-dev ...
-Preparing to replace g++-4.0 4.0.2-2 (using .../g++-4.0_4.0.2-5_amd64.deb) ...
-Unpacking replacement g++-4.0 ...
-Preparing to replace gcc-4.0 4.0.2-2 (using .../gcc-4.0_4.0.2-5_amd64.deb) ...
-Unpacking replacement gcc-4.0 ...
-Preparing to replace cpp-4.0 4.0.2-2 (using .../cpp-4.0_4.0.2-5_amd64.deb) ...
-Unpacking replacement cpp-4.0 ...
-Preparing to replace libgcc1 1:4.0.2-2 (using .../libgcc1_1%3a4.0.2-5_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up libgcc1 (4.0.2-5) ...
-
-(Reading database ... 11827 files and directories currently installed.)
-Preparing to replace gcc-4.0-base 4.0.2-2 (using .../gcc-4.0-base_4.0.2-5_amd64.deb) ...
-Unpacking replacement gcc-4.0-base ...
-Preparing to replace libstdc++6 4.0.2-2 (using .../libstdc++6_4.0.2-5_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up gcc-4.0-base (4.0.2-5) ...
-Setting up libstdc++6 (4.0.2-5) ...
-
-(Reading database ... 11827 files and directories currently installed.)
+Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
+Unpacking replacement libdb4.3 ...
 Preparing to replace apt-utils 0.6.42.2 (using .../apt-utils_0.6.43_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Selecting previously deselected package libsigc++-2.0-0c2a.
 Unpacking libsigc++-2.0-0c2a (from .../libsigc++-2.0-0c2a_2.0.16-2_amd64.deb) ...
-Preparing to replace aptitude 0.2.15.9-7 (using .../aptitude_0.4.0-5_amd64.deb) ...
+Preparing to replace aptitude 0.2.15.9-7 (using .../aptitude_0.4.1-1_amd64.deb) ...
 Unpacking replacement aptitude ...
 Preparing to replace apt 0.6.42.2 (using .../archives/apt_0.6.43_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.43) ...
 
-(Reading database ... 11841 files and directories currently installed.)
-Preparing to replace lsb-base 3.0-11 (using .../lsb-base_3.0-12_all.deb) ...
-Unpacking replacement lsb-base ...
+(Reading database ... 11854 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-4 (using .../initscripts_2.86.ds1-6_amd64.deb) ...
 Unpacking replacement initscripts ...
-Setting up lsb-base (3.0-12) ...
 Setting up initscripts (2.86.ds1-6) ...
 Installing new version of config file /etc/init.d/bootclean.sh ...
 Installing new version of config file /etc/init.d/bootlogd ...
@@ -154,92 +140,102 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/umountroot ...
 Installing new version of config file /etc/init.d/urandom ...
 
-(Reading database ... 11842 files and directories currently installed.)
+(Reading database ... 11855 files and directories currently installed.)
 Preparing to replace libacl1 2.2.32-1 (using .../libacl1_2.2.34-1_amd64.deb) ...
 Unpacking replacement libacl1 ...
 Setting up libacl1 (2.2.34-1) ...
 
-(Reading database ... 11842 files and directories currently installed.)
+(Reading database ... 11855 files and directories currently installed.)
+Preparing to replace libblkid1 1.38-2 (using .../libblkid1_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libblkid1 ...
+Setting up libblkid1 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 11855 files and directories currently installed.)
+Preparing to replace libcomerr2 1.38-2 (using .../libcomerr2_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libcomerr2 ...
+Setting up libcomerr2 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 11855 files and directories currently installed.)
+Preparing to replace libss2 1.38-2 (using .../libss2_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libss2 ...
+Setting up libss2 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 11855 files and directories currently installed.)
+Preparing to replace libuuid1 1.38-2 (using .../libuuid1_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libuuid1 ...
+Setting up libuuid1 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 11855 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-4 (using .../sysv-rc_2.86.ds1-6_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-6) ...
 
-(Reading database ... 11842 files and directories currently installed.)
-Preparing to replace adduser 3.79 (using .../archives/adduser_3.80_all.deb) ...
-Unpacking replacement adduser ...
+(Reading database ... 11855 files and directories currently installed.)
 Preparing to replace console-data 2002.12.04dbs-50 (using .../console-data_2002.12.04dbs-52_all.deb) ...
 Unpacking replacement console-data ...
-Preparing to replace console-tools 1:0.2.3dbs-58 (using .../console-tools_1%3a0.2.3dbs-60_amd64.deb) ...
-Unpacking replacement console-tools ...
-Preparing to replace libconsole 1:0.2.3dbs-58 (using .../libconsole_1%3a0.2.3dbs-60_amd64.deb) ...
-Unpacking replacement libconsole ...
 Preparing to replace base-config 2.73 (using .../base-config_2.74_all.deb) ...
 Unpacking replacement base-config ...
 Preparing to replace libssl0.9.8 0.9.8a-3 (using .../libssl0.9.8_0.9.8a-4_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
-Preparing to replace manpages 2.10-1 (using .../manpages_2.13-1_all.deb) ...
+Preparing to replace manpages 2.10-1 (using .../manpages_2.16-1_all.deb) ...
 Unpacking replacement manpages ...
 Preparing to replace nano 1.3.8-2 (using .../nano_1.3.9-1_amd64.deb) ...
 Unpacking replacement nano ...
-Preparing to replace net-tools 1.60-16 (using .../net-tools_1.60-17_amd64.deb) ...
-Unpacking replacement net-tools ...
 Preparing to replace tasksel 2.33 (using .../archives/tasksel_2.37_all.deb) ...
 Unpacking replacement tasksel ...
 Preparing to replace procps 1:3.2.5-1 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
 Unpacking replacement procps ...
-Preparing to replace libpcre3 6.4-1 (using .../libpcre3_6.4-1.1_amd64.deb) ...
-Unpacking replacement libpcre3 ...
-Preparing to replace make 3.80-11 (using .../make_3.80-12_amd64.deb) ...
+Preparing to replace binutils 2.16.1cvs20051117-1 (using .../binutils_2.16.1cvs20051206-1_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace cpp 4:4.0.2-1 (using .../cpp_4%3a4.0.2-2_amd64.deb) ...
+Unpacking replacement cpp ...
+Preparing to replace gcc 4:4.0.2-1 (using .../gcc_4%3a4.0.2-2_amd64.deb) ...
+Removing old gcc doc directory.
+Unpacking replacement gcc ...
+Preparing to replace g++ 4:4.0.2-1 (using .../g++_4%3a4.0.2-2_amd64.deb) ...
+Unpacking replacement g++ ...
+Preparing to replace make 3.80-11 (using .../make_3.80+3.81.b3-1_amd64.deb) ...
 Unpacking replacement make ...
-Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-20_amd64.deb) ...
+Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-21_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
 Setting up libdb4.3 (4.3.29-1) ...
-Setting up cpp-4.0 (4.0.2-5) ...
-Setting up gcc-4.0 (4.0.2-5) ...
 Setting up apt-utils (0.6.43) ...
 
 Setting up libsigc++-2.0-0c2a (2.0.16-2) ...
 
-Setting up aptitude (0.4.0-5) ...
-
-Setting up libconsole (0.2.3dbs-60) ...
+Setting up aptitude (0.4.1-1) ...
 
-Setting up manpages (2.13-1) ...
+Setting up manpages (2.16-1) ...
 Setting up nano (1.3.9-1) ...
 
-Setting up net-tools (1.60-17) ...
 Setting up procps (3.2.6-2) ...
 Installing new version of config file /etc/init.d/procps.sh ...
 Installing new version of config file /etc/sysctl.conf ...
 
-Setting up libpcre3 (6.4-1.1) ...
+Setting up binutils (2.16.1cvs20051206-1) ...
+
+Setting up cpp (4.0.2-2) ...
+
+Setting up gcc (4.0.2-2) ...
 
-Setting up make (3.80-12) ...
+Setting up g++ (4.0.2-2) ...
 
-Setting up libdb4.2 (4.2.52-20) ...
+Setting up make (3.80+3.81.b3-1) ...
+
+Setting up libdb4.2 (4.2.52-21) ...
 Setting up debconf-i18n (1.4.62) ...
-Setting up libstdc++6-4.0-dev (4.0.2-5) ...
-Setting up perl-modules (5.8.7-8) ...
 Setting up debconf (1.4.62) ...
 
-Setting up g++-4.0 (4.0.2-5) ...
-Setting up adduser (3.80) ...
-
 Setting up console-data (2002.12.04dbs-52) ...
 Looking for keymap to install:
 NONE
 
-Setting up console-tools (0.2.3dbs-60) ...
-Installing new version of config file /etc/init.d/console-screen.sh ...
-
 Setting up base-config (2.74) ...
 
 Setting up libssl0.9.8 (0.9.8a-4) ...
 
 Setting up tasksel (2.37) ...
 
-Setting up perl (5.8.7-8) ...
-
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -249,6 +245,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//15202 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//15377 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log
index 82a4d43..6bda6f9 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/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.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//1486/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//7174/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -18,8 +18,8 @@ Ign http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org ../project/experimental Release [4245B]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [115kB]
-Fetched 120kB in 1s (119kB/s)
+Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [121kB]
+Fetched 126kB in 0s (419kB/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: GPG error: http://ftp.jp.debian.org ../project/experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -30,21 +30,36 @@ Reading package lists...
 Building dependency tree...
 The following packages will be REMOVED:
   aptitude tasksel
+The following NEW packages will be installed:
+  gcc-4.1-base
 The following packages will be upgraded:
-  apt apt-utils diff
-3 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
-Need to get 0B/1679kB of archives.
-After unpacking 8610kB disk space will be freed.
+  apt apt-utils diff libgcc1 libstdc++6
+5 upgraded, 1 newly installed, 2 to remove and 0 not upgraded.
+Need to get 0B/2253kB of archives.
+After unpacking 8958kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
-  diff apt-utils apt
-(Reading database ... 12279 files and directories currently installed.)
+  diff gcc-4.1-base libgcc1 libstdc++6 apt-utils apt
+(Reading database ... 12287 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 12088 files and directories currently installed.)
+(Reading database ... 12096 files and directories currently installed.)
 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) ...
-(Reading database ... 12096 files and directories currently installed.)
+Selecting previously deselected package gcc-4.1-base.
+(Reading database ... 12104 files and directories currently installed.)
+Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1-0exp4_amd64.deb) ...
+Preparing to replace libgcc1 1:4.0.2-5 (using .../libgcc1_1%3a4.1-0exp4_amd64.deb) ...
+Unpacking replacement libgcc1 ...
+Setting up gcc-4.1-base (4.1-0exp4) ...
+Setting up libgcc1 (4.1-0exp4) ...
+
+(Reading database ... 12110 files and directories currently installed.)
+Preparing to replace libstdc++6 4.0.2-5 (using .../libstdc++6_4.1-0exp4_amd64.deb) ...
+Unpacking replacement libstdc++6 ...
+Setting up libstdc++6 (4.1-0exp4) ...
+
+(Reading database ... 12107 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43 (using .../apt-utils_0.6.43exp2_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43 (using .../apt_0.6.43exp2_amd64.deb) ...
@@ -62,6 +77,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//1486 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//7174 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
index 40d8bbf..e803d33 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
+++ b/testsuite/cdebootstrap/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.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//31673/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//5538/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 [5722B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3812kB]
-Fetched 3818kB in 2s (1554kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3818kB]
+Fetched 3824kB in 2s (1815kB/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
@@ -25,117 +25,101 @@ Building dependency tree...
 The following NEW packages will be installed:
   libsigc++-2.0-0c2a
 The following packages will be upgraded:
-  adduser apt apt-utils aptitude base-config bsdutils console-data
-  console-tools coreutils cpp-3.3 cpp-4.0 debconf debconf-i18n findutils
-  g++-3.3 g++-4.0 gcc-3.3 gcc-3.3-base gcc-4.0 gcc-4.0-base initscripts
-  libacl1 libconsole libdb4.2 libdb4.3 libgcc1 libpcre3 libssl0.9.8 libstdc++5
-  libstdc++5-3.3-dev libstdc++6 libstdc++6-4.0-dev lsb-base make manpages
-  mount nano net-tools perl perl-base perl-modules procps sed sysv-rc sysvinit
-  tasksel util-linux
-47 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/35.5MB of archives.
-After unpacking 2367kB of additional disk space will be used.
+  apt apt-utils aptitude base-config bash binutils bsdutils console-data
+  coreutils cpp debconf debconf-i18n debianutils e2fslibs e2fsprogs findutils
+  g++ gcc initscripts libacl1 libblkid1 libcomerr2 libdb4.2 libdb4.3 libss2
+  libssl0.9.8 libuuid1 make manpages module-init-tools mount nano procps sed
+  sysv-rc sysvinit tasksel util-linux
+38 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/18.1MB of archives.
+After unpacking 3142kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  bsdutils coreutils findutils mount perl-modules libdb4.3 perl perl-base sed
-  sysvinit util-linux debconf-i18n debconf libstdc++6-4.0-dev g++-4.0 gcc-4.0
-  cpp-4.0 libgcc1 gcc-4.0-base libstdc++6 apt-utils libsigc++-2.0-0c2a
-  aptitude apt lsb-base initscripts libacl1 sysv-rc adduser console-data
-  console-tools libconsole base-config libssl0.9.8 manpages nano net-tools
-  tasksel procps libpcre3 make gcc-3.3-base cpp-3.3 gcc-3.3 libstdc++5
-  libstdc++5-3.3-dev g++-3.3 libdb4.2
-(Reading database ... 12235 files and directories currently installed.)
-Preparing to replace bsdutils 1:2.12p-8 (using .../bsdutils_1%3a2.12r-1_amd64.deb) ...
+  debianutils bash bsdutils coreutils e2fslibs e2fsprogs findutils mount sed
+  sysvinit util-linux debconf-i18n debconf libdb4.3 apt-utils
+  libsigc++-2.0-0c2a aptitude apt initscripts libacl1 libblkid1 libcomerr2
+  libss2 libuuid1 sysv-rc console-data base-config libssl0.9.8 manpages
+  module-init-tools nano tasksel procps binutils cpp gcc g++ make libdb4.2
+(Reading database ... 12264 files and directories currently installed.)
+Preparing to replace debianutils 2.15.1 (using .../debianutils_2.15.2_amd64.deb) ...
+Unpacking replacement debianutils ...
+Setting up debianutils (2.15.2) ...
+
+(Reading database ... 12266 files and directories currently installed.)
+Preparing to replace bash 3.0-17 (using .../archives/bash_3.1-1_amd64.deb) ...
+Unpacking replacement bash ...
+Setting up bash (3.1-1) ...
+Installing new version of config file /etc/bash_completion ...
+
+(Reading database ... 12266 files and directories currently installed.)
+Preparing to replace bsdutils 1:2.12p-8 (using .../bsdutils_1%3a2.12r-2_amd64.deb) ...
 Unpacking replacement bsdutils ...
-Setting up bsdutils (2.12r-1) ...
+Setting up bsdutils (2.12r-2) ...
 
-(Reading database ... 12235 files and directories currently installed.)
+(Reading database ... 12266 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.93-5_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.93-5) ...
 
-(Reading database ... 12249 files and directories currently installed.)
+(Reading database ... 12280 files and directories currently installed.)
+Preparing to replace e2fslibs 1.38-2 (using .../e2fslibs_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement e2fslibs ...
+Setting up e2fslibs (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 12280 files and directories currently installed.)
+Preparing to replace e2fsprogs 1.38-2 (using .../e2fsprogs_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement e2fsprogs ...
+Setting up e2fsprogs (1.38+1.39-WIP-2005.12.10-1) ...
+(Reading database ... 12280 files and directories currently installed.)
 Preparing to replace findutils 4.2.25-1 (using .../findutils_4.2.26-2_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.26-2) ...
 Installing new version of config file /etc/updatedb.conf ...
 
-(Reading database ... 12250 files and directories currently installed.)
-Preparing to replace mount 2.12p-8 (using .../mount_2.12r-1_amd64.deb) ...
+(Reading database ... 12281 files and directories currently installed.)
+Preparing to replace mount 2.12p-8 (using .../mount_2.12r-2_amd64.deb) ...
 Unpacking replacement mount ...
-Setting up mount (2.12r-1) ...
+Setting up mount (2.12r-2) ...
 
-(Reading database ... 12250 files and directories currently installed.)
-Preparing to replace perl-modules 5.8.7-7 (using .../perl-modules_5.8.7-8_all.deb) ...
-Unpacking replacement perl-modules ...
-Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
-Unpacking replacement libdb4.3 ...
-Preparing to replace perl 5.8.7-7 (using .../perl_5.8.7-8_amd64.deb) ...
-Unpacking replacement perl ...
-Preparing to replace perl-base 5.8.7-7 (using .../perl-base_5.8.7-8_amd64.deb) ...
-Unpacking replacement perl-base ...
-Setting up perl-base (5.8.7-8) ...
-(Reading database ... 12248 files and directories currently installed.)
-Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
+(Reading database ... 12281 files and directories currently installed.)
+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-4) ...
+Setting up sed (4.1.4-5) ...
 
-(Reading database ... 12249 files and directories currently installed.)
+(Reading database ... 12282 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-4 (using .../sysvinit_2.86.ds1-6_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-6) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12249 files and directories currently installed.)
-Preparing to replace util-linux 2.12p-8 (using .../util-linux_2.12r-1_amd64.deb) ...
+(Reading database ... 12282 files and directories currently installed.)
+Preparing to replace util-linux 2.12p-8 (using .../util-linux_2.12r-2_amd64.deb) ...
 Unpacking replacement util-linux ...
-Setting up util-linux (2.12r-1) ...
+Setting up util-linux (2.12r-2) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 12249 files and directories currently installed.)
+(Reading database ... 12282 files and directories currently installed.)
 Preparing to replace debconf-i18n 1.4.59 (using .../debconf-i18n_1.4.62_all.deb) ...
 Unpacking replacement debconf-i18n ...
 Preparing to replace debconf 1.4.59 (using .../debconf_1.4.62_all.deb) ...
 Unpacking replacement debconf ...
-Preparing to replace libstdc++6-4.0-dev 4.0.2-2 (using .../libstdc++6-4.0-dev_4.0.2-5_amd64.deb) ...
-Unpacking replacement libstdc++6-4.0-dev ...
-Preparing to replace g++-4.0 4.0.2-2 (using .../g++-4.0_4.0.2-5_amd64.deb) ...
-Unpacking replacement g++-4.0 ...
-Preparing to replace gcc-4.0 4.0.2-2 (using .../gcc-4.0_4.0.2-5_amd64.deb) ...
-Unpacking replacement gcc-4.0 ...
-Preparing to replace cpp-4.0 4.0.2-2 (using .../cpp-4.0_4.0.2-5_amd64.deb) ...
-Unpacking replacement cpp-4.0 ...
-Preparing to replace libgcc1 1:4.0.2-2 (using .../libgcc1_1%3a4.0.2-5_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up libgcc1 (4.0.2-5) ...
-
-(Reading database ... 12271 files and directories currently installed.)
-Preparing to replace gcc-4.0-base 4.0.2-2 (using .../gcc-4.0-base_4.0.2-5_amd64.deb) ...
-Unpacking replacement gcc-4.0-base ...
-Preparing to replace libstdc++6 4.0.2-2 (using .../libstdc++6_4.0.2-5_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up gcc-4.0-base (4.0.2-5) ...
-Setting up libstdc++6 (4.0.2-5) ...
-
-(Reading database ... 12271 files and directories currently installed.)
+Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
+Unpacking replacement libdb4.3 ...
 Preparing to replace apt-utils 0.6.42.2 (using .../apt-utils_0.6.43_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Selecting previously deselected package libsigc++-2.0-0c2a.
 Unpacking libsigc++-2.0-0c2a (from .../libsigc++-2.0-0c2a_2.0.16-2_amd64.deb) ...
-Preparing to replace aptitude 0.2.15.9-7 (using .../aptitude_0.4.0-5_amd64.deb) ...
+Preparing to replace aptitude 0.2.15.9-7 (using .../aptitude_0.4.1-1_amd64.deb) ...
 Unpacking replacement aptitude ...
 Preparing to replace apt 0.6.42.2 (using .../archives/apt_0.6.43_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.43) ...
 
-(Reading database ... 12285 files and directories currently installed.)
-Preparing to replace lsb-base 3.0-11 (using .../lsb-base_3.0-12_all.deb) ...
-Unpacking replacement lsb-base ...
+(Reading database ... 12298 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-4 (using .../initscripts_2.86.ds1-6_amd64.deb) ...
 Unpacking replacement initscripts ...
-Setting up lsb-base (3.0-12) ...
 Setting up initscripts (2.86.ds1-6) ...
 Installing new version of config file /etc/init.d/bootclean.sh ...
 Installing new version of config file /etc/init.d/bootlogd ...
@@ -156,111 +140,106 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/umountroot ...
 Installing new version of config file /etc/init.d/urandom ...
 
-(Reading database ... 12286 files and directories currently installed.)
+(Reading database ... 12299 files and directories currently installed.)
 Preparing to replace libacl1 2.2.32-1 (using .../libacl1_2.2.34-1_amd64.deb) ...
 Unpacking replacement libacl1 ...
 Setting up libacl1 (2.2.34-1) ...
 
-(Reading database ... 12286 files and directories currently installed.)
+(Reading database ... 12299 files and directories currently installed.)
+Preparing to replace libblkid1 1.38-2 (using .../libblkid1_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libblkid1 ...
+Setting up libblkid1 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 12299 files and directories currently installed.)
+Preparing to replace libcomerr2 1.38-2 (using .../libcomerr2_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libcomerr2 ...
+Setting up libcomerr2 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 12299 files and directories currently installed.)
+Preparing to replace libss2 1.38-2 (using .../libss2_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libss2 ...
+Setting up libss2 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 12299 files and directories currently installed.)
+Preparing to replace libuuid1 1.38-2 (using .../libuuid1_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libuuid1 ...
+Setting up libuuid1 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 12299 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-4 (using .../sysv-rc_2.86.ds1-6_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-6) ...
 
-(Reading database ... 12286 files and directories currently installed.)
-Preparing to replace adduser 3.79 (using .../archives/adduser_3.80_all.deb) ...
-Unpacking replacement adduser ...
+(Reading database ... 12299 files and directories currently installed.)
 Preparing to replace console-data 2002.12.04dbs-50 (using .../console-data_2002.12.04dbs-52_all.deb) ...
 Unpacking replacement console-data ...
-Preparing to replace console-tools 1:0.2.3dbs-58 (using .../console-tools_1%3a0.2.3dbs-60_amd64.deb) ...
-Unpacking replacement console-tools ...
-Preparing to replace libconsole 1:0.2.3dbs-58 (using .../libconsole_1%3a0.2.3dbs-60_amd64.deb) ...
-Unpacking replacement libconsole ...
 Preparing to replace base-config 2.73 (using .../base-config_2.74_all.deb) ...
 Unpacking replacement base-config ...
 Preparing to replace libssl0.9.8 0.9.8a-3 (using .../libssl0.9.8_0.9.8a-4_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
-Preparing to replace manpages 2.10-1 (using .../manpages_2.13-1_all.deb) ...
+Preparing to replace manpages 2.10-1 (using .../manpages_2.16-1_all.deb) ...
 Unpacking replacement manpages ...
+Preparing to replace module-init-tools 3.2-pre9-4 (using .../module-init-tools_3.2.2-1_amd64.deb) ...
+Unpacking replacement module-init-tools ...
 Preparing to replace nano 1.3.8-2 (using .../nano_1.3.9-1_amd64.deb) ...
 Unpacking replacement nano ...
-Preparing to replace net-tools 1.60-16 (using .../net-tools_1.60-17_amd64.deb) ...
-Unpacking replacement net-tools ...
 Preparing to replace tasksel 2.33 (using .../archives/tasksel_2.37_all.deb) ...
 Unpacking replacement tasksel ...
 Preparing to replace procps 1:3.2.5-1 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
 Unpacking replacement procps ...
-Preparing to replace libpcre3 6.4-1 (using .../libpcre3_6.4-1.1_amd64.deb) ...
-Unpacking replacement libpcre3 ...
-Preparing to replace make 3.80-11 (using .../make_3.80-12_amd64.deb) ...
+Preparing to replace binutils 2.16.1cvs20051117-1 (using .../binutils_2.16.1cvs20051206-1_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace cpp 4:4.0.2-1 (using .../cpp_4%3a4.0.2-2_amd64.deb) ...
+Unpacking replacement cpp ...
+Preparing to replace gcc 4:4.0.2-1 (using .../gcc_4%3a4.0.2-2_amd64.deb) ...
+Removing old gcc doc directory.
+Unpacking replacement gcc ...
+Preparing to replace g++ 4:4.0.2-1 (using .../g++_4%3a4.0.2-2_amd64.deb) ...
+Unpacking replacement g++ ...
+Preparing to replace make 3.80-11 (using .../make_3.80+3.81.b3-1_amd64.deb) ...
 Unpacking replacement make ...
-Preparing to replace gcc-3.3-base 1:3.3.6-7 (using .../gcc-3.3-base_1%3a3.3.6-10_amd64.deb) ...
-Unpacking replacement gcc-3.3-base ...
-Preparing to replace cpp-3.3 1:3.3.6-7 (using .../cpp-3.3_1%3a3.3.6-10_amd64.deb) ...
-Unpacking replacement cpp-3.3 ...
-Preparing to replace gcc-3.3 1:3.3.6-7 (using .../gcc-3.3_1%3a3.3.6-10_amd64.deb) ...
-Unpacking replacement gcc-3.3 ...
-Preparing to replace libstdc++5 1:3.3.6-7 (using .../libstdc++5_1%3a3.3.6-10_amd64.deb) ...
-Unpacking replacement libstdc++5 ...
-Preparing to replace libstdc++5-3.3-dev 1:3.3.6-7 (using .../libstdc++5-3.3-dev_1%3a3.3.6-10_amd64.deb) ...
-Unpacking replacement libstdc++5-3.3-dev ...
-Preparing to replace g++-3.3 1:3.3.6-7 (using .../g++-3.3_1%3a3.3.6-10_amd64.deb) ...
-Unpacking replacement g++-3.3 ...
-Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-20_amd64.deb) ...
+Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-21_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
 Setting up libdb4.3 (4.3.29-1) ...
-Setting up cpp-4.0 (4.0.2-5) ...
-Setting up gcc-4.0 (4.0.2-5) ...
 Setting up apt-utils (0.6.43) ...
 
 Setting up libsigc++-2.0-0c2a (2.0.16-2) ...
 
-Setting up aptitude (0.4.0-5) ...
+Setting up aptitude (0.4.1-1) ...
 
-Setting up libconsole (0.2.3dbs-60) ...
+Setting up manpages (2.16-1) ...
+Setting up module-init-tools (3.2.2-1) ...
 
-Setting up manpages (2.13-1) ...
 Setting up nano (1.3.9-1) ...
 
-Setting up net-tools (1.60-17) ...
 Setting up procps (3.2.6-2) ...
 Installing new version of config file /etc/init.d/procps.sh ...
 Installing new version of config file /etc/sysctl.conf ...
 
-Setting up libpcre3 (6.4-1.1) ...
+Setting up binutils (2.16.1cvs20051206-1) ...
+
+Setting up cpp (4.0.2-2) ...
+
+Setting up gcc (4.0.2-2) ...
 
-Setting up make (3.80-12) ...
+Setting up g++ (4.0.2-2) ...
 
-Setting up gcc-3.3-base (3.3.6-10) ...
-Setting up cpp-3.3 (3.3.6-10) ...
-Setting up gcc-3.3 (3.3.6-10) ...
-Setting up libstdc++5 (3.3.6-10) ...
+Setting up make (3.80+3.81.b3-1) ...
 
-Setting up libdb4.2 (4.2.52-20) ...
+Setting up libdb4.2 (4.2.52-21) ...
 Setting up debconf-i18n (1.4.62) ...
-Setting up libstdc++6-4.0-dev (4.0.2-5) ...
-Setting up libstdc++5-3.3-dev (3.3.6-10) ...
-Setting up perl-modules (5.8.7-8) ...
 Setting up debconf (1.4.62) ...
 
-Setting up g++-4.0 (4.0.2-5) ...
-Setting up adduser (3.80) ...
-
 Setting up console-data (2002.12.04dbs-52) ...
 Looking for keymap to install:
 NONE
 
-Setting up console-tools (0.2.3dbs-60) ...
-Installing new version of config file /etc/init.d/console-screen.sh ...
-
 Setting up base-config (2.74) ...
 
 Setting up libssl0.9.8 (0.9.8a-4) ...
 
 Setting up tasksel (2.37) ...
 
-Setting up g++-3.3 (3.3.6-10) ...
-Setting up perl (5.8.7-8) ...
-
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -270,6 +249,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//31673 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//5538 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
index 3a93bb6..b87a240 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
+++ b/testsuite/cdebootstrap/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.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//25658/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//32521/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 [3505kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3523kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3505kB in 2s (1485kB/s)
+Fetched 3523kB in 1s (1957kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -43,7 +43,7 @@ The following packages will be upgraded:
   sysvinit tar tasksel telnet util-linux wget whiptail zlib1g
 112 upgraded, 17 newly installed, 1 to remove and 0 not upgraded.
 Need to get 0B/62.0MB of archives.
-After unpacking 34.6MB of additional disk space will be used.
+After unpacking 34.4MB of additional disk space will be used.
 (Reading database ... 10733 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 ...
@@ -74,22 +74,22 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-8.1) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Sat Dec 10 03:52:47 UTC 2005.
-Universal Time is now:  Sat Dec 10 03:52:47 UTC 2005.
+Local time is now:      Wed Dec 14 03:28:34 UTC 2005.
+Universal Time is now:  Wed Dec 14 03:28:34 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11067 files and directories currently installed.)
-Preparing to replace libgcc1 1:3.4.3-13 (using .../libgcc1_1%3a4.0.2-2_amd64.deb) ...
+Preparing to replace libgcc1 1:3.4.3-13 (using .../libgcc1_1%3a4.0.2-5_amd64.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up libgcc1 (4.0.2-2) ...
+Setting up libgcc1 (4.0.2-5) ...
 
 Selecting previously deselected package gcc-4.0-base.
 (Reading database ... 11068 files and directories currently installed.)
-Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.2-2_amd64.deb) ...
+Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package libstdc++6.
-Unpacking libstdc++6 (from .../libstdc++6_4.0.2-2_amd64.deb) ...
-Setting up gcc-4.0-base (4.0.2-2) ...
-Setting up libstdc++6 (4.0.2-2) ...
+Unpacking libstdc++6 (from .../libstdc++6_4.0.2-5_amd64.deb) ...
+Setting up gcc-4.0-base (4.0.2-5) ...
+Setting up libstdc++6 (4.0.2-5) ...
 
 (Reading database ... 11080 files and directories currently installed.)
 Preparing to replace apt-utils 0.5.28.6 (using .../apt-utils_0.6.42.2_amd64.deb) ...
@@ -151,7 +151,7 @@ Preparing to replace liblzo1 1.08-1.2 (using .../liblzo1_1.08-2_amd64.deb) ...
 Unpacking replacement liblzo1 ...
 Selecting previously deselected package libgnutls12.
 Unpacking libgnutls12 (from .../libgnutls12_1.2.9-2_amd64.deb) ...
-Preparing to replace libpcre3 4.5-1.2 (using .../libpcre3_6.4-1_amd64.deb) ...
+Preparing to replace libpcre3 4.5-1.2 (using .../libpcre3_6.4-1.1_amd64.deb) ...
 Unpacking replacement libpcre3 ...
 Preparing to replace exim4-daemon-light 4.50-8 (using .../exim4-daemon-light_4.60-1_amd64.deb) ...
 Unpacking replacement exim4-daemon-light ...
@@ -159,25 +159,27 @@ Selecting previously deselected package libselinux1.
 Unpacking libselinux1 (from .../libselinux1_1.26-1_amd64.deb) ...
 Setting up libselinux1 (1.26-1) ...
 
-(Reading database ... 11110 files and directories currently installed.)
+(Reading database ... 11108 files and directories currently installed.)
 Preparing to replace libpam-runtime 0.76-22 (using .../libpam-runtime_0.79-3_all.deb) ...
 Unpacking replacement libpam-runtime ...
 Setting up libpam-runtime (0.79-3) ...
 Installing new version of config file /etc/pam.conf ...
 
-(Reading database ... 11110 files and directories currently installed.)
+(Reading database ... 11108 files and directories currently installed.)
 Preparing to replace libpam0g 0.76-22 (using .../libpam0g_0.79-3_amd64.deb) ...
 Unpacking replacement libpam0g ...
 Setting up libpam0g (0.79-3) ...
 
-(Reading database ... 11110 files and directories currently installed.)
-Preparing to replace perl-modules 5.8.4-8 (using .../perl-modules_5.8.7-7_all.deb) ...
+(Reading database ... 11108 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.4-8 (using .../perl-modules_5.8.7-9_all.deb) ...
 Unpacking replacement perl-modules ...
-Preparing to replace perl 5.8.4-8 (using .../perl_5.8.7-7_amd64.deb) ...
+Selecting previously deselected package libdb4.3.
+Unpacking libdb4.3 (from .../libdb4.3_4.3.28-2_amd64.deb) ...
+Preparing to replace perl 5.8.4-8 (using .../perl_5.8.7-9_amd64.deb) ...
 Unpacking replacement perl ...
-Preparing to replace perl-base 5.8.4-8 (using .../perl-base_5.8.7-7_amd64.deb) ...
+Preparing to replace perl-base 5.8.4-8 (using .../perl-base_5.8.7-9_amd64.deb) ...
 Unpacking replacement perl-base ...
-Setting up perl-base (5.8.7-7) ...
+Setting up perl-base (5.8.7-9) ...
 (Reading database ... 11621 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 ...
@@ -191,7 +193,7 @@ Preparing to replace debconf-i18n 1.4.30.13 (using .../debconf-i18n_1.4.59_all.d
 Unpacking replacement debconf-i18n ...
 Preparing to replace debconf 1.4.30.13 (using .../debconf_1.4.59_all.deb) ...
 Unpacking replacement debconf ...
-Preparing to replace adduser 3.63 (using .../archives/adduser_3.79_all.deb) ...
+Preparing to replace adduser 3.63 (using .../archives/adduser_3.80_all.deb) ...
 Unpacking replacement adduser ...
 Preparing to replace cron 3.0pl1-86 (using .../cron_3.0pl1-92_amd64.deb) ...
 Unpacking replacement cron ...
@@ -201,8 +203,8 @@ 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) ...
 Selecting previously deselected package lsb-base.
-(Reading database ... 11650 files and directories currently installed.)
-Unpacking lsb-base (from .../lsb-base_3.0-11_all.deb) ...
+(Reading database ... 11663 files and directories currently installed.)
+Unpacking lsb-base (from .../lsb-base_3.0-12_all.deb) ...
 Preparing to replace netkit-inetd 0.10-10 (using .../netkit-inetd_0.10-10.2_amd64.deb) ...
 Unpacking replacement netkit-inetd ...
 Preparing to replace iputils-ping 3:20020927-2 (using .../iputils-ping_3%3a20020927-3_amd64.deb) ...
@@ -211,8 +213,6 @@ Preparing to replace netbase 4.21 (using .../archives/netbase_4.23_all.deb) ...
 Unpacking replacement netbase ...
 Preparing to replace exim4-base 4.50-8 (using .../exim4-base_4.60-1_amd64.deb) ...
 Unpacking replacement exim4-base ...
-Selecting previously deselected package libdb4.3.
-Unpacking libdb4.3 (from .../libdb4.3_4.3.28-2_amd64.deb) ...
 Preparing to replace libpam-modules 0.76-22 (using .../libpam-modules_0.79-3_amd64.deb) ...
 Unpacking replacement libpam-modules ...
 Setting up libdb4.3 (4.3.28-2) ...
@@ -221,7 +221,7 @@ Installing new version of config file /etc/security/access.conf ...
 Installing new version of config file /etc/security/pam_env.conf ...
 Installing new version of config file /etc/security/limits.conf ...
 
-(Reading database ... 11666 files and directories currently installed.)
+(Reading database ... 11675 files and directories currently installed.)
 Preparing to replace login 1:4.0.3-31sarge5 (using .../login_1%3a4.0.13-7_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.13-7) ...
@@ -229,14 +229,14 @@ 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 ... 11675 files and directories currently installed.)
+(Reading database ... 11684 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.3-31sarge5 (using .../passwd_1%3a4.0.13-7_amd64.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.13-7) ...
 Installing new version of config file /etc/pam.d/chfn ...
 Installing new version of config file /etc/pam.d/chsh ...
 
-(Reading database ... 11701 files and directories currently installed.)
+(Reading database ... 11710 files and directories currently installed.)
 Preparing to replace bash 2.05b-26 (using .../archives/bash_3.0-17_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.0-17) ...
@@ -245,17 +245,17 @@ Installing new version of config file /etc/skel/.bash_profile ...
 Installing new version of config file /etc/bash.bashrc ...
 Installing new version of config file /etc/bash_completion ...
 
-(Reading database ... 11705 files and directories currently installed.)
+(Reading database ... 11714 files and directories currently installed.)
 Preparing to replace bsdutils 1:2.12p-4 (using .../bsdutils_1%3a2.12p-8_amd64.deb) ...
 Unpacking replacement bsdutils ...
 Setting up bsdutils (2.12p-8) ...
 
-(Reading database ... 11705 files and directories currently installed.)
+(Reading database ... 11714 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 ... 11704 files and directories currently installed.)
+(Reading database ... 11713 files and directories currently installed.)
 Preparing to replace dpkg 1.10.28 (using .../dpkg_1.13.11_amd64.deb) ...
 Unpacking replacement dpkg ...
 Setting up dpkg (1.13.11) ...
@@ -269,69 +269,69 @@ 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 ... 11703 files and directories currently installed.)
+(Reading database ... 11712 files and directories currently installed.)
 Preparing to replace e2fslibs 1.37-2sarge1 (using .../e2fslibs_1.38-2_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.38-2) ...
 
-(Reading database ... 11703 files and directories currently installed.)
+(Reading database ... 11712 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.37-2sarge1 (using .../e2fsprogs_1.38-2_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Setting up e2fsprogs (1.38-2) ...
-(Reading database ... 11707 files and directories currently installed.)
+(Reading database ... 11716 files and directories currently installed.)
 Preparing to replace findutils 4.1.20-6 (using .../findutils_4.2.25-1_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.25-1) ...
 Installing new version of config file /etc/updatedb.conf ...
 
-(Reading database ... 11727 files and directories currently installed.)
+(Reading database ... 11736 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 ... 11726 files and directories currently installed.)
+(Reading database ... 11735 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 ... 11726 files and directories currently installed.)
+(Reading database ... 11735 files and directories currently installed.)
 Preparing to replace hostname 2.13 (using .../hostname_2.91_amd64.deb) ...
 Unpacking replacement hostname ...
 Setting up hostname (2.91) ...
-(Reading database ... 11726 files and directories currently installed.)
+(Reading database ... 11735 files and directories currently installed.)
 Preparing to replace mount 2.12p-4 (using .../mount_2.12p-8_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.12p-8) ...
 
 Selecting previously deselected package libsepol1.
-(Reading database ... 11726 files and directories currently installed.)
+(Reading database ... 11735 files and directories currently installed.)
 Unpacking libsepol1 (from .../libsepol1_1.8-1_amd64.deb) ...
 Setting up libsepol1 (1.8-1) ...
 
-(Reading database ... 11731 files and directories currently installed.)
+(Reading database ... 11740 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-4_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-4) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11731 files and directories currently installed.)
+(Reading database ... 11740 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../tar_1.15.1-2_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-2) ...
 
 Selecting previously deselected package libslang2.
-(Reading database ... 11735 files and directories currently installed.)
+(Reading database ... 11744 files and directories currently installed.)
 Unpacking libslang2 (from .../libslang2_2.0.5-1_amd64.deb) ...
 Setting up libslang2 (2.0.5-1) ...
 
-(Reading database ... 11747 files and directories currently installed.)
+(Reading database ... 11756 files and directories currently installed.)
 Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12p-8_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12p-8) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11747 files and directories currently installed.)
+(Reading database ... 11756 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 ...
@@ -369,12 +369,12 @@ 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 ... 11751 files and directories currently installed.)
+(Reading database ... 11760 files and directories currently installed.)
 Preparing to replace console-data 2002.12.04dbs-49 (using .../console-data_2002.12.04dbs-50_all.deb) ...
 Unpacking replacement console-data ...
-Preparing to replace console-tools 1:0.2.3dbs-56 (using .../console-tools_1%3a0.2.3dbs-58_amd64.deb) ...
+Preparing to replace console-tools 1:0.2.3dbs-56 (using .../console-tools_1%3a0.2.3dbs-60_amd64.deb) ...
 Unpacking replacement console-tools ...
-Preparing to replace libconsole 1:0.2.3dbs-56 (using .../libconsole_1%3a0.2.3dbs-58_amd64.deb) ...
+Preparing to replace libconsole 1:0.2.3dbs-56 (using .../libconsole_1%3a0.2.3dbs-60_amd64.deb) ...
 Unpacking replacement libconsole ...
 Setting up liblocale-gettext-perl (1.05-1) ...
 Setting up libtext-iconv-perl (1.4-2) ...
@@ -383,17 +383,17 @@ Setting up libtext-wrapi18n-perl (0.06-4) ...
 Setting up debconf-i18n (1.4.59) ...
 Setting up debconf (1.4.59) ...
 
-(Reading database ... 11752 files and directories currently installed.)
+(Reading database ... 11761 files and directories currently installed.)
 Preparing to replace console-common 0.7.49 (using .../console-common_0.7.55_all.deb) ...
 Unpacking replacement console-common ...
 Preparing to replace dselect 1.10.28 (using .../dselect_1.13.11_amd64.deb) ...
 Unpacking replacement dselect ...
 Setting up dselect (1.13.11) ...
 Installing new version of config file /etc/dpkg/dselect.cfg ...
-(Reading database ... 11757 files and directories currently installed.)
+(Reading database ... 11766 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-4_amd64.deb) ...
 Unpacking replacement initscripts ...
-Setting up lsb-base (3.0-11) ...
+Setting up lsb-base (3.0-12) ...
 Setting up initscripts (2.86.ds1-4) ...
 Installing new version of config file /etc/init.d/bootclean.sh ...
 Installing new version of config file /etc/init.d/bootlogd ...
@@ -414,7 +414,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 ... 11758 files and directories currently installed.)
+(Reading database ... 11767 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.32-1_amd64.deb) ...
@@ -423,51 +423,51 @@ Setting up libattr1 (2.4.25-1) ...
 
 Setting up libacl1 (2.2.32-1) ...
 
-(Reading database ... 11758 files and directories currently installed.)
+(Reading database ... 11767 files and directories currently installed.)
 Preparing to replace libblkid1 1.37-2sarge1 (using .../libblkid1_1.38-2_amd64.deb) ...
 Unpacking replacement libblkid1 ...
 Setting up libblkid1 (1.38-2) ...
 
-(Reading database ... 11758 files and directories currently installed.)
+(Reading database ... 11767 files and directories currently installed.)
 Preparing to replace libcomerr2 1.37-2sarge1 (using .../libcomerr2_1.38-2_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.38-2) ...
 
-(Reading database ... 11758 files and directories currently installed.)
+(Reading database ... 11767 files and directories currently installed.)
 Preparing to replace libss2 1.37-2sarge1 (using .../libss2_1.38-2_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.38-2) ...
 
-(Reading database ... 11758 files and directories currently installed.)
+(Reading database ... 11767 files and directories currently installed.)
 Preparing to replace libuuid1 1.37-2sarge1 (using .../libuuid1_1.38-2_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.38-2) ...
 
-(Reading database ... 11758 files and directories currently installed.)
+(Reading database ... 11767 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-4_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-4) ...
 
-(Reading database ... 11758 files and directories currently installed.)
+(Reading database ... 11767 files and directories currently installed.)
 Preparing to replace binutils 2.15-6 (using .../binutils_2.16.1cvs20051117-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-7_amd64.deb) ...
+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) ...
 Unpacking replacement libstdc++5-3.3-dev ...
-Preparing to replace g++-3.3 1:3.3.5-13 (using .../g++-3.3_1%3a3.3.6-7_amd64.deb) ...
+Preparing to replace g++-3.3 1:3.3.5-13 (using .../g++-3.3_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement g++-3.3 ...
-Preparing to replace gcc-3.3 1:3.3.5-13 (using .../gcc-3.3_1%3a3.3.6-7_amd64.deb) ...
+Preparing to replace gcc-3.3 1:3.3.5-13 (using .../gcc-3.3_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement gcc-3.3 ...
-Preparing to replace cpp-3.3 1:3.3.5-13 (using .../cpp-3.3_1%3a3.3.6-7_amd64.deb) ...
+Preparing to replace cpp-3.3 1:3.3.5-13 (using .../cpp-3.3_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement cpp-3.3 ...
-Preparing to replace gcc-3.3-base 1:3.3.5-13 (using .../gcc-3.3-base_1%3a3.3.6-7_amd64.deb) ...
+Preparing to replace gcc-3.3-base 1:3.3.5-13 (using .../gcc-3.3-base_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement gcc-3.3-base ...
-Preparing to replace libstdc++5 1:3.3.5-13 (using .../libstdc++5_1%3a3.3.6-7_amd64.deb) ...
+Preparing to replace libstdc++5 1:3.3.5-13 (using .../libstdc++5_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement libstdc++5 ...
-Setting up gcc-3.3-base (3.3.6-7) ...
-Setting up libstdc++5 (3.3.6-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 ... 11776 files and directories currently installed.)
+(Reading database ... 11785 files and directories currently installed.)
 Unpacking dmidecode (from .../dmidecode_2.7-2_amd64.deb) ...
 Selecting previously deselected package laptop-detect.
 Unpacking laptop-detect (from .../laptop-detect_0.12.1_amd64.deb) ...
@@ -505,7 +505,7 @@ Preparing to replace modutils 2.4.26-1.2 (using .../modutils_2.4.27.0-3_amd64.de
 Unpacking replacement modutils ...
 Preparing to replace nano 1.2.4-5 (using .../nano_1.3.8-2_amd64.deb) ...
 Unpacking replacement nano ...
-Preparing to replace net-tools 1.60-10 (using .../net-tools_1.60-16_amd64.deb) ...
+Preparing to replace net-tools 1.60-10 (using .../net-tools_1.60-17_amd64.deb) ...
 Unpacking replacement net-tools ...
 Preparing to replace wget 1.9.1-12 (using .../wget_1.10.2-1_amd64.deb) ...
 Unpacking replacement wget ...
@@ -521,7 +521,7 @@ Preparing to replace at 3.1.8-11 (using .../archives/at_3.1.9_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-2_amd64.deb) ...
+Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-5_amd64.deb) ...
 Preparing to replace cpp 4:3.3.5-3 (using .../cpp_4%3a4.0.2-1_amd64.deb) ...
 Unpacking replacement cpp ...
 Preparing to replace make 3.80-9 (using .../make_3.80-11_amd64.deb) ...
@@ -531,14 +531,14 @@ Unpacking replacement dpkg-dev ...
 Preparing to replace exim4 4.50-8 (using .../archives/exim4_4.60-1_all.deb) ...
 Unpacking replacement exim4 ...
 Selecting previously deselected package gcc-4.0.
-Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-2_amd64.deb) ...
+Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-5_amd64.deb) ...
 Preparing to replace gcc 4:3.3.5-3 (using .../gcc_4%3a4.0.2-1_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-2_amd64.deb) ...
+Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package g++-4.0.
-Unpacking g++-4.0 (from .../g++-4.0_4.0.2-2_amd64.deb) ...
+Unpacking g++-4.0 (from .../g++-4.0_4.0.2-5_amd64.deb) ...
 Preparing to replace g++ 4:3.3.5-3 (using .../g++_4%3a4.0.2-1_amd64.deb) ...
 Unpacking replacement g++ ...
 Preparing to replace telnet 0.17-29 (using .../telnet_0.17-32_amd64.deb) ...
@@ -577,9 +577,9 @@ Setting up liblzo1 (1.08-2) ...
 
 Setting up libgnutls12 (1.2.9-2) ...
 
-Setting up libpcre3 (6.4-1) ...
+Setting up libpcre3 (6.4-1.1) ...
 
-Setting up adduser (3.79) ...
+Setting up adduser (3.80) ...
 
 Setting up cron (3.0pl1-92) ...
 Installing new version of config file /etc/init.d/cron ...
@@ -613,12 +613,12 @@ Installing new version of config file /etc/cron.daily/exim4-base ...
 
 Setting up exim4-daemon-light (4.60-1) ...
 
-Setting up libconsole (0.2.3dbs-58) ...
+Setting up libconsole (0.2.3dbs-60) ...
 
 Setting up binutils (2.16.1cvs20051117-1) ...
 
-Setting up cpp-3.3 (3.3.6-7) ...
-Setting up gcc-3.3 (3.3.6-7) ...
+Setting up cpp-3.3 (3.3.6-10) ...
+Setting up gcc-3.3 (3.3.6-10) ...
 Setting up dmidecode (2.7-2) ...
 Setting up laptop-detect (0.12.1) ...
 Setting up tasksel (2.33) ...
@@ -659,7 +659,7 @@ Architecture-specific modutils configuration for x86_64 not found, using default
 Setting up nano (1.3.8-2) ...
 Installing new version of config file /etc/nanorc ...
 
-Setting up net-tools (1.60-16) ...
+Setting up net-tools (1.60-17) ...
 Setting up wget (1.10.2-1) ...
 Installing new version of config file /etc/wgetrc ...
 
@@ -676,12 +676,12 @@ Installing new version of config file /etc/init.d/procps.sh ...
 Setting up at (3.1.9) ...
 Installing new version of config file /etc/init.d/atd ...
 
-Setting up cpp-4.0 (4.0.2-2) ...
+Setting up cpp-4.0 (4.0.2-5) ...
 Setting up cpp (4.0.2-1) ...
 Setting up make (3.80-11) ...
 
 Setting up exim4 (4.60-1) ...
-Setting up gcc-4.0 (4.0.2-2) ...
+Setting up gcc-4.0 (4.0.2-5) ...
 Setting up gcc (4.0.2-1) ...
 
 Setting up telnet (0.17-32) ...
@@ -703,10 +703,10 @@ Setting up console-data (2002.12.04dbs-50) ...
 Looking for keymap to install:
 NONE
 
-Setting up libstdc++5-3.3-dev (3.3.6-7) ...
-Setting up libstdc++6-4.0-dev (4.0.2-2) ...
-Setting up perl-modules (5.8.7-7) ...
-Setting up console-tools (0.2.3dbs-58) ...
+Setting up libstdc++5-3.3-dev (3.3.6-10) ...
+Setting up libstdc++6-4.0-dev (4.0.2-5) ...
+Setting up perl-modules (5.8.7-9) ...
+Setting up console-tools (0.2.3dbs-60) ...
 Installing new version of config file /etc/init.d/console-screen.sh ...
 
 Setting up console-common (0.7.55) ...
@@ -714,13 +714,13 @@ Installing new version of config file /etc/init.d/keymap.sh ...
 Looking for keymap to install:
 NONE
 
-Setting up g++-3.3 (3.3.6-7) ...
+Setting up g++-3.3 (3.3.6-10) ...
 Setting up base-config (2.73) ...
 
-Setting up g++-4.0 (4.0.2-2) ...
+Setting up g++-4.0 (4.0.2-5) ...
 Setting up g++ (4.0.2-1) ...
 
-Setting up perl (5.8.7-7) ...
+Setting up perl (5.8.7-9) ...
 
 Setting up dpkg-dev (1.13.11) ...
 Installing new version of config file /etc/dpkg/shlibs.default ...
@@ -735,6 +735,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//25658 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//32521 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index 5bd9416..9853586 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-etch.log
+++ b/testsuite/cdebootstrap/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.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/6711/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/8174/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.9 2005/12/05 12:15:08 dancer Exp $
@@ -26,7 +26,7 @@ After unpacking 737kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   libdebian-installer4 libdebian-installer-extra4 cdebootstrap pbuilder
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11791 files and directories currently installed.)
+(Reading database ... 11820 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.35_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.35_amd64.deb) ...
@@ -64,7 +64,7 @@ WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package libmagic1.
-(Reading database ... 11884 files and directories currently installed.)
+(Reading database ... 11913 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) ...
@@ -110,7 +110,7 @@ After unpacking 360kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 12475 files and directories currently installed.)
+(Reading database ... 12504 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
 Setting up fakeroot (1.5.5) ...
 
@@ -123,14 +123,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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -319,18 +319,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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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; \
@@ -343,26 +343,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.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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
@@ -400,8 +400,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
@@ -413,7 +413,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
-Sat Dec 10 04:06:05 UTC 2005
+Wed Dec 14 03:36:18 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -483,14 +483,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
-Sat Dec 10 04:06:10 UTC 2005
+Wed Dec 14 03:36:23 UTC 2005
 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
@@ -499,9 +499,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -511,58 +511,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.w6uwRC/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/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.w6uwRC/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.O4g2U4/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.O4g2U4/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.w6uwRC/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.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/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.w6uwRC/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.O4g2U4/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.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/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.w6uwRC/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.w6uwRC/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.w6uwRC/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.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/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.O4g2U4/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.O4g2U4/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.O4g2U4/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.O4g2U4/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.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -600,6 +600,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.w6uwRC/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/6711 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/8174 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sarge.log b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
index 619388e..a1f554e 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sarge.log
+++ b/testsuite/cdebootstrap/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.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/17170/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/25349/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.9 2005/12/05 12:15:08 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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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
@@ -360,6 +360,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
@@ -394,11 +395,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
-Sat Dec 10 03:50:34 UTC 2005
+Wed Dec 14 03:27:36 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -468,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
-Sat Dec 10 03:50:39 UTC 2005
+Wed Dec 14 03:27:41 UTC 2005
 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).
+a: a
 c: c
-b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -484,9 +485,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -494,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.w6uwRC/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/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.w6uwRC/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.O4g2U4/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.O4g2U4/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.w6uwRC/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.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/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.w6uwRC/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.O4g2U4/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.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/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.w6uwRC/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.w6uwRC/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.w6uwRC/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.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/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.O4g2U4/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.O4g2U4/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.O4g2U4/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.O4g2U4/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.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -569,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.w6uwRC/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/17170 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/25349 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index f183d22..eaf3457 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sid.log
+++ b/testsuite/cdebootstrap/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.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/7521/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/20306/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.9 2005/12/05 12:15:08 dancer Exp $
@@ -26,7 +26,7 @@ After unpacking 745kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   libdebian-installer4 libdebian-installer-extra4 cdebootstrap pbuilder
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11818 files and directories currently installed.)
+(Reading database ... 11826 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.36_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.36_amd64.deb) ...
@@ -64,7 +64,7 @@ WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package libmagic1.
-(Reading database ... 11912 files and directories currently installed.)
+(Reading database ... 11920 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) ...
@@ -79,7 +79,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.1_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.9_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.10_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -95,7 +95,7 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.1) ...
-Setting up debhelper (5.0.9) ...
+Setting up debhelper (5.0.10) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
@@ -110,7 +110,7 @@ After unpacking 360kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 12508 files and directories currently installed.)
+(Reading database ... 12516 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
 Setting up fakeroot (1.5.5) ...
 
@@ -123,14 +123,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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -143,7 +143,7 @@ dpkg-source: building dsh in dsh_0.25.6-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
- ./configure --prefix=/usr --sysconfdir=/etc/dsh --mandir=/usr/share/man
+	 ./configure --prefix=/usr --sysconfdir=/etc/dsh --mandir=/usr/share/man
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
 checking for gawk... no
@@ -319,50 +319,50 @@ 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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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
+	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; \
-then mv -f ".deps/dsh-linkedlist.Tpo" ".deps/dsh-linkedlist.Po"; else rm -f ".deps/dsh-linkedlist.Tpo"; exit 1; fi
+	then mv -f ".deps/dsh-linkedlist.Tpo" ".deps/dsh-linkedlist.Po"; else rm -f ".deps/dsh-linkedlist.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-parameter.o -MD -MP -MF ".deps/dsh-parameter.Tpo" -c -o dsh-parameter.o `test -f 'parameter.c' || echo './'`parameter.c; \
-then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
+	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
 gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
 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.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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
@@ -374,6 +374,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
@@ -397,10 +398,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
@@ -408,11 +409,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
-Sat Dec 10 03:42:38 UTC 2005
+Wed Dec 14 03:22:41 UTC 2005
 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 +483,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
-Sat Dec 10 03:42:43 UTC 2005
+Wed Dec 14 03:22:46 UTC 2005
 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
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -498,9 +499,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -510,58 +511,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.w6uwRC/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/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.w6uwRC/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.O4g2U4/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.O4g2U4/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.w6uwRC/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.w6uwRC/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.w6uwRC/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/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.w6uwRC/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.O4g2U4/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.O4g2U4/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.O4g2U4/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.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/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.w6uwRC/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.w6uwRC/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.w6uwRC/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.w6uwRC/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.w6uwRC/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.w6uwRC/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.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.O4g2U4/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.O4g2U4/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.O4g2U4/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.O4g2U4/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.O4g2U4/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.O4g2U4/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.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -599,6 +600,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.w6uwRC/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/7521 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/20306 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index 335b70b..df11e4a 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-etch.log
+++ b/testsuite/cdebootstrap/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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: Sat Dec 10 13:03:21 JST 2005
-pbuilder-time-stamp: 1134187401
+Current time: Wed Dec 14 12:34:44 JST 2005
+pbuilder-time-stamp: 1134531284
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/31275/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/1269/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -69,7 +69,7 @@ WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package libmagic1.
-(Reading database ... 11791 files and directories currently installed.)
+(Reading database ... 11820 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) ...
@@ -115,13 +115,13 @@ After unpacking 360kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 12382 files and directories currently installed.)
+(Reading database ... 12411 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
 Setting up fakeroot (1.5.5) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/31275/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/31275/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/1269/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/1269/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -410,6 +410,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
@@ -444,11 +445,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
-2: 2
 1: 1
+2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 10 04:04:40 UTC 2005
+Wed Dec 14 03:35:27 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -518,14 +519,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
-Sat Dec 10 04:04:45 UTC 2005
+Wed Dec 14 03:35:32 UTC 2005
 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
@@ -647,7 +648,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: Sat Dec 10 13:04:47 JST 2005
-pbuilder-time-stamp: 1134187487
+Current time: Wed Dec 14 12:35:34 JST 2005
+pbuilder-time-stamp: 1134531334
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/31275 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/1269 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sarge.log b/testsuite/cdebootstrap/pdebuild-normal-sarge.log
index b7540ac..d08758c 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sarge.log
+++ b/testsuite/cdebootstrap/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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: Sat Dec 10 12:48:01 JST 2005
-pbuilder-time-stamp: 1134186481
+Current time: Wed Dec 14 12:26:11 JST 2005
+pbuilder-time-stamp: 1134530771
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/9434/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/18580/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.w6uwRC/dir3/9434/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/9434/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/18580/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/18580/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -426,10 +426,10 @@ success
 success
 success
 success
-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
 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
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -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
-Sat Dec 10 03:49:09 UTC 2005
+Wed Dec 14 03:26:48 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -511,7 +511,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
-Sat Dec 10 03:49:14 UTC 2005
+Wed Dec 14 03:26:53 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.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: Sat Dec 10 12:49:16 JST 2005
-pbuilder-time-stamp: 1134186557
+Current time: Wed Dec 14 12:26:54 JST 2005
+pbuilder-time-stamp: 1134530814
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/9434 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/18580 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index 921a553..3bfc7ff 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sid.log
+++ b/testsuite/cdebootstrap/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/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: Sat Dec 10 12:38:19 JST 2005
-pbuilder-time-stamp: 1134185899
+Current time: Wed Dec 14 12:21:09 JST 2005
+pbuilder-time-stamp: 1134530469
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/31151/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/13525/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -69,7 +69,7 @@ WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package libmagic1.
-(Reading database ... 11818 files and directories currently installed.)
+(Reading database ... 11826 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) ...
@@ -84,7 +84,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.1_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.9_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.10_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -100,7 +100,7 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.1) ...
-Setting up debhelper (5.0.9) ...
+Setting up debhelper (5.0.10) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
@@ -115,13 +115,13 @@ After unpacking 360kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 12414 files and directories currently installed.)
+(Reading database ... 12422 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
 Setting up fakeroot (1.5.5) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/31151/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/31151/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/13525/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/13525/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -179,7 +179,7 @@ dpkg-source: building dsh in dsh_0.25.6-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
- ./configure --prefix=/usr --sysconfdir=/etc/dsh --mandir=/usr/share/man
+	 ./configure --prefix=/usr --sysconfdir=/etc/dsh --mandir=/usr/share/man
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
 checking for gawk... no
@@ -368,11 +368,11 @@ make[3]: Nothing to be done for `all'.
 make[3]: Leaving directory `/tmp/buildd/dsh-0.25.6/po'
 make[3]: Entering directory `/tmp/buildd/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
+	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; \
-then mv -f ".deps/dsh-linkedlist.Tpo" ".deps/dsh-linkedlist.Po"; else rm -f ".deps/dsh-linkedlist.Tpo"; exit 1; fi
+	then mv -f ".deps/dsh-linkedlist.Tpo" ".deps/dsh-linkedlist.Po"; else rm -f ".deps/dsh-linkedlist.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-parameter.o -MD -MP -MF ".deps/dsh-parameter.Tpo" -c -o dsh-parameter.o `test -f 'parameter.c' || echo './'`parameter.c; \
-then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
+	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
 gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
@@ -410,7 +410,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
@@ -445,11 +444,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
-2: 2
 1: 1
+2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 10 03:40:35 UTC 2005
+Wed Dec 14 03:21:47 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -519,14 +518,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
-Sat Dec 10 03:40:40 UTC 2005
+Wed Dec 14 03:21:52 UTC 2005
 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
 c: c
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -563,14 +562,14 @@ mkdir -p -- /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share
 mkdir -p -- /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
 installing ja.gmo as /tmp/buildd/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` /tmp/buildd/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 \
-		    /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
-  done; \
-else \
-  : ; \
-fi
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/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 \
+			    /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
 make[2]: Leaving directory `/tmp/buildd/dsh-0.25.6/po'
 make[2]: Entering directory `/tmp/buildd/dsh-0.25.6'
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.6'
@@ -580,13 +579,13 @@ install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.6/debian/dsh/usr/b
 test -z "/etc/dsh" || mkdir -p -- . "/tmp/buildd/dsh-0.25.6/debian/dsh/etc/dsh"
  /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
-	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
-	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
-done
+		mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
+			> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
+			> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+	done
 test -z "/usr/share/man/man1" || mkdir -p -- . "/tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/man1"
  /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
 test -z "/usr/share/man/man5" || mkdir -p -- . "/tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/man5"
@@ -648,7 +647,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: Sat Dec 10 12:40:46 JST 2005
-pbuilder-time-stamp: 1134186046
+Current time: Wed Dec 14 12:21:54 JST 2005
+pbuilder-time-stamp: 1134530514
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/31151 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/13525 and its subdirectories