test log update

14 files changed, 165 insertions, 187 deletions

diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index db2fdcf..5682217 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -410,7 +410,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
-Mon Jun  4 03:09:07 UTC 2007
+Tue Jun  5 03:08:27 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -480,14 +480,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
-Mon Jun  4 03:09:12 UTC 2007
+Tue Jun  5 03:08:32 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-c: c
-dsh: Process terminated (before write).
 a: a
 b: b
+dsh: Process terminated (before write).
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pbuilder-build-dsh-lenny.log b/testsuite/normal/pbuilder-build-dsh-lenny.log
index 65067ef..63ec514 100644
--- a/testsuite/normal/pbuilder-build-dsh-lenny.log
+++ b/testsuite/normal/pbuilder-build-dsh-lenny.log
@@ -410,7 +410,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
-Mon Jun  4 03:17:17 UTC 2007
+Tue Jun  5 03:17:03 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -480,14 +480,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
-Mon Jun  4 03:17:22 UTC 2007
+Tue Jun  5 03:17:08 UTC 2007
 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
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index 0afc3aa..5ba7fed 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -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
-Mon Jun  4 03:03:58 UTC 2007
+Tue Jun  5 03:03:28 UTC 2007
 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
-Mon Jun  4 03:04:03 UTC 2007
+Tue Jun  5 03:03:33 UTC 2007
 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
diff --git a/testsuite/normal/pbuilder-update-etch-etch.log b/testsuite/normal/pbuilder-update-etch-etch.log
index 14bcb74..8f8c175 100644
--- a/testsuite/normal/pbuilder-update-etch-etch.log
+++ b/testsuite/normal/pbuilder-update-etch-etch.log
@@ -21,13 +21,13 @@ The following packages will be upgraded:
   base-files binutils cpio debconf debconf-i18n debianutils dhcp3-client
   dhcp3-common diff dmidecode findutils gzip info iputils-ping klogd
   laptop-detect libacl1 libattr1 libc6 libc6-dev libgcrypt11 libgpg-error0
-  libldap2 libncurses5 libncursesw5 libopencdk8 libsepol1 libslang2
-  libssl0.9.8 libtasn1-3 libusb-0.1-4 make man-db manpages mktemp
-  module-init-tools nano ncurses-base ncurses-bin netcat sed sysklogd tar
-  tasksel tasksel-data tzdata vim-common vim-tiny zlib1g
-49 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 20.1MB of archives.
-After unpacking 3695kB of additional disk space will be used.
+  libldap2 libncurses5 libncursesw5 libopencdk8 libreadline5 libsepol1
+  libslang2 libssl0.9.8 libtasn1-3 libusb-0.1-4 make man-db manpages mktemp
+  module-init-tools nano ncurses-base ncurses-bin netcat readline-common sed
+  sysklogd tar tasksel tasksel-data tzdata vim-common vim-tiny zlib1g
+51 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 20.2MB of archives.
+After unpacking 3609kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main debconf-i18n 1.5.13 [151kB]
 Get:2 http://cdn.debian.or.jp lenny/main debconf 1.5.13 [148kB]
 Get:3 http://cdn.debian.or.jp lenny/main tzdata 2007f-3 [384kB]
@@ -50,7 +50,7 @@ Get:19 http://cdn.debian.or.jp lenny/main libacl1 2.2.42-1 [16.1kB]
 Get:20 http://cdn.debian.or.jp lenny/main libsepol1 1.14-3 [125kB]
 Get:21 http://cdn.debian.or.jp lenny/main libslang2 2.0.7-1 [453kB]
 Get:22 http://cdn.debian.or.jp lenny/main zlib1g 1:1.2.3-15 [73.5kB]
-Get:23 http://cdn.debian.or.jp lenny/main cpio 2.7-1 [114kB]
+Get:23 http://cdn.debian.or.jp lenny/main cpio 2.7-3 [115kB]
 Get:24 http://cdn.debian.or.jp lenny/main dhcp3-client 3.0.4-14 [222kB]
 Get:25 http://cdn.debian.or.jp lenny/main dhcp3-common 3.0.4-14 [287kB]
 Get:26 http://cdn.debian.or.jp lenny/main dmidecode 2.9-1 [58.8kB]
@@ -64,20 +64,22 @@ Get:33 http://cdn.debian.or.jp lenny/main libgcrypt11 1.2.4-2 [190kB]
 Get:34 http://cdn.debian.or.jp lenny/main libldap2 2.1.30-13.4 [162kB]
 Get:35 http://cdn.debian.or.jp lenny/main libncursesw5 5.6-3 [358kB]
 Get:36 http://cdn.debian.or.jp lenny/main libopencdk8 0.5.13-2 [104kB]
-Get:37 http://cdn.debian.or.jp lenny/main libssl0.9.8 0.9.8e-5 [909kB]
-Get:38 http://cdn.debian.or.jp lenny/main libtasn1-3 0.3.9-1 [57.8kB]
-Get:39 http://cdn.debian.or.jp lenny/main libusb-0.1-4 2:0.1.12-7 [20.4kB]
-Get:40 http://cdn.debian.or.jp lenny/main man-db 2.4.4-3 [765kB]
-Get:41 http://cdn.debian.or.jp lenny/main manpages 2.49-1 [495kB]
-Get:42 http://cdn.debian.or.jp lenny/main module-init-tools 3.3-pre11-1 [85.3kB]
-Get:43 http://cdn.debian.or.jp lenny/main nano 2.0.3-1 [570kB]
-Get:44 http://cdn.debian.or.jp lenny/main netcat 1.10-33 [68.3kB]
-Get:45 http://cdn.debian.or.jp lenny/main tasksel 2.67 [76.7kB]
-Get:46 http://cdn.debian.or.jp lenny/main tasksel-data 2.67 [345kB]
-Get:47 http://cdn.debian.or.jp lenny/main vim-tiny 1:7.0-219+1 [617kB]
-Get:48 http://cdn.debian.or.jp lenny/main vim-common 1:7.0-219+1 [185kB]
-Get:49 http://cdn.debian.or.jp lenny/main make 3.81-3 [395kB]
-
Extracting templates from packages: 61%
Extracting templates from packages: 100%
+Get:37 http://cdn.debian.or.jp lenny/main readline-common 5.2-3 [50.8kB]
+Get:38 http://cdn.debian.or.jp lenny/main libreadline5 5.2-3 [144kB]
+Get:39 http://cdn.debian.or.jp lenny/main libssl0.9.8 0.9.8e-5 [909kB]
+Get:40 http://cdn.debian.or.jp lenny/main libtasn1-3 0.3.9-1 [57.8kB]
+Get:41 http://cdn.debian.or.jp lenny/main libusb-0.1-4 2:0.1.12-7 [20.4kB]
+Get:42 http://cdn.debian.or.jp lenny/main man-db 2.4.4-3 [765kB]
+Get:43 http://cdn.debian.or.jp lenny/main manpages 2.49-1 [495kB]
+Get:44 http://cdn.debian.or.jp lenny/main module-init-tools 3.3-pre11-1 [85.3kB]
+Get:45 http://cdn.debian.or.jp lenny/main nano 2.0.3-1 [570kB]
+Get:46 http://cdn.debian.or.jp lenny/main netcat 1.10-33 [68.3kB]
+Get:47 http://cdn.debian.or.jp lenny/main tasksel 2.67 [76.7kB]
+Get:48 http://cdn.debian.or.jp lenny/main tasksel-data 2.67 [345kB]
+Get:49 http://cdn.debian.or.jp lenny/main vim-tiny 1:7.0-219+1 [617kB]
+Get:50 http://cdn.debian.or.jp lenny/main vim-common 1:7.0-219+1 [185kB]
+Get:51 http://cdn.debian.or.jp lenny/main make 3.81-3 [395kB]
+
Extracting templates from packages: 58%
Extracting templates from packages: 100%
 Preconfiguring packages ...
 Fetched XXXB in Xs (XXXXXB/s)
 (Reading database ... 12033 files and directories currently installed.)
@@ -188,7 +190,7 @@ Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-15) ...
 
 (Reading database ... 12111 files and directories currently installed.)
-Preparing to replace cpio 2.6-17 (using .../archives/cpio_2.7-1_amd64.deb) ...
+Preparing to replace cpio 2.6-17 (using .../archives/cpio_2.7-3_amd64.deb) ...
 Unpacking replacement cpio ...
 Preparing to replace dhcp3-client 3.0.4-13 (using .../dhcp3-client_3.0.4-14_amd64.deb) ...
 Unpacking replacement dhcp3-client ...
@@ -216,6 +218,10 @@ Preparing to replace libncursesw5 5.5-5 (using .../libncursesw5_5.6-3_amd64.deb)
 Unpacking replacement libncursesw5 ...
 Preparing to replace libopencdk8 0.5.9-2 (using .../libopencdk8_0.5.13-2_amd64.deb) ...
 Unpacking replacement libopencdk8 ...
+Preparing to replace readline-common 5.2-2 (using .../readline-common_5.2-3_all.deb) ...
+Unpacking replacement readline-common ...
+Preparing to replace libreadline5 5.2-2 (using .../libreadline5_5.2-3_amd64.deb) ...
+Unpacking replacement libreadline5 ...
 Preparing to replace libssl0.9.8 0.9.8c-4 (using .../libssl0.9.8_0.9.8e-5_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
 Preparing to replace libtasn1-3 0.3.6-2 (using .../libtasn1-3_0.3.9-1_amd64.deb) ...
@@ -245,7 +251,7 @@ Unpacking replacement make ...
 Setting up binutils (2.17cvs20070426-8) ...
 
 Setting up libc6-dev (2.5-9) ...
-Setting up cpio (2.7-1) ...
+Setting up cpio (2.7-3) ...
 
 Setting up dhcp3-common (3.0.4-14) ...
 Setting up dhcp3-client (3.0.4-14) ...
@@ -265,6 +271,10 @@ Setting up libncursesw5 (5.6-3) ...
 
 Setting up libopencdk8 (0.5.13-2) ...
 
+Setting up readline-common (5.2-3) ...
+
+Setting up libreadline5 (5.2-3) ...
+
 Setting up libssl0.9.8 (0.9.8e-5) ...
 
 Setting up libtasn1-3 (0.3.9-1) ...
diff --git a/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
index 395e198..c6cd879 100644
--- a/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
@@ -15,7 +15,7 @@ Get:2 http://cdn.debian.or.jp experimental Release.gpg [189B]
 Hit http://cdn.debian.or.jp sid Release
 Get:3 http://cdn.debian.or.jp experimental Release [79.6kB]
 Get:4 http://cdn.debian.or.jp sid/main Packages/DiffIndex [2038B]
-Get:5 http://cdn.debian.or.jp experimental/main Packages [228kB]
+Get:5 http://cdn.debian.or.jp experimental/main Packages [232kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -38,15 +38,15 @@ Get:2 http://cdn.debian.or.jp experimental/main libc6-dev 2.6-0exp2 [2474kB]
 Get:3 http://cdn.debian.or.jp experimental/main libc6 2.6-0exp2 [4753kB]
 Get:4 http://cdn.debian.or.jp experimental/main coreutils 6.0-1 [3141kB]
 Get:5 http://cdn.debian.or.jp experimental/main findutils 4.3.6-1 [606kB]
-Get:6 http://cdn.debian.or.jp experimental/main ncurses-bin 5.6+20070526-1 [160kB]
-Get:7 http://cdn.debian.or.jp experimental/main libncurses5 5.6+20070526-1 [338kB]
+Get:6 http://cdn.debian.or.jp experimental/main ncurses-bin 5.6+20070602-1 [160kB]
+Get:7 http://cdn.debian.or.jp experimental/main libncurses5 5.6+20070602-1 [339kB]
 Get:8 http://cdn.debian.or.jp experimental/main ncurses-base 5.6+20070602-1 [12.9kB]
 Get:9 http://cdn.debian.or.jp experimental/main apt-utils 0.7.0 [192kB]
 Get:10 http://cdn.debian.or.jp experimental/main apt 0.7.0 [1453kB]
 Get:11 http://cdn.debian.or.jp experimental/main libgcrypt11 1.3.0-1 [233kB]
 Get:12 http://cdn.debian.or.jp experimental/main libopencdk10 0.6.1-1 [84.7kB]
 Get:13 http://cdn.debian.or.jp experimental/main libgnutls13 1.7.9-1 [381kB]
-Get:14 http://cdn.debian.or.jp experimental/main libncursesw5 5.6+20070526-1 [359kB]
+Get:14 http://cdn.debian.or.jp experimental/main libncursesw5 5.6+20070602-1 [360kB]
 Get:15 http://cdn.debian.or.jp experimental/main wget 1.10.2+1.11.beta1-1 [635kB]
 Get:16 http://cdn.debian.or.jp experimental/main binutils 2.17.20070406cvs-2 [2730kB]
 Get:17 http://cdn.debian.or.jp sid/main cpp-4.2 4.2-20070528-1 [2702kB]
@@ -88,13 +88,13 @@ Unpacking replacement findutils ...
 Setting up findutils (4.3.6-1) ...
 
 (Reading database ... 10849 files and directories currently installed.)
-Preparing to replace ncurses-bin 5.6-3 (using .../ncurses-bin_5.6+20070526-1_amd64.deb) ...
+Preparing to replace ncurses-bin 5.6-3 (using .../ncurses-bin_5.6+20070602-1_amd64.deb) ...
 Unpacking replacement ncurses-bin ...
-Setting up ncurses-bin (5.6+20070526-1) ...
+Setting up ncurses-bin (5.6+20070602-1) ...
 (Reading database ... 10848 files and directories currently installed.)
-Preparing to replace libncurses5 5.6-3 (using .../libncurses5_5.6+20070526-1_amd64.deb) ...
+Preparing to replace libncurses5 5.6-3 (using .../libncurses5_5.6+20070602-1_amd64.deb) ...
 Unpacking replacement libncurses5 ...
-Setting up libncurses5 (5.6+20070526-1) ...
+Setting up libncurses5 (5.6+20070602-1) ...
 
 (Reading database ... 10848 files and directories currently installed.)
 Preparing to replace ncurses-base 5.6-3 (using .../ncurses-base_5.6+20070602-1_all.deb) ...
@@ -121,7 +121,7 @@ Selecting previously deselected package libopencdk10.
 Unpacking libopencdk10 (from .../libopencdk10_0.6.1-1_amd64.deb) ...
 Preparing to replace libgnutls13 1.6.3-1 (using .../libgnutls13_1.7.9-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
-Preparing to replace libncursesw5 5.6-3 (using .../libncursesw5_5.6+20070526-1_amd64.deb) ...
+Preparing to replace libncursesw5 5.6-3 (using .../libncursesw5_5.6+20070602-1_amd64.deb) ...
 Unpacking replacement libncursesw5 ...
 Preparing to replace wget 1.10.2-2 (using .../wget_1.10.2+1.11.beta1-1_amd64.deb) ...
 Unpacking replacement wget ...
@@ -154,7 +154,7 @@ Setting up libopencdk10 (0.6.1-1) ...
 
 Setting up libgnutls13 (1.7.9-1) ...
 
-Setting up libncursesw5 (5.6+20070526-1) ...
+Setting up libncursesw5 (5.6+20070602-1) ...
 
 Setting up wget (1.10.2+1.11.beta1-1) ...
 
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index 4c0cd18..da1bc99 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -11,7 +11,7 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp sid Release [79.6kB]
-Get:3 http://cdn.debian.or.jp sid/main Packages [6246kB]
+Get:3 http://cdn.debian.or.jp sid/main Packages [6251kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -22,15 +22,14 @@ The following packages will be REMOVED:
 The following NEW packages will be installed:
   gcc-4.2-base libdevmapper1.02.1 liblzo2-2
 The following packages will be upgraded:
-  cpio cpp cpp-4.1 debian-archive-keyring debianutils dpkg dpkg-dev dselect
+  cpp cpp-4.1 debian-archive-keyring debianutils dpkg dpkg-dev dselect
   e2fslibs e2fsprogs findutils g++ g++-4.1 gcc gcc-4.1 gcc-4.1-base
   laptop-detect libblkid1 libbz2-1.0 libc6 libc6-dev libcomerr2 libgcc1
-  libgnutls13 libreadline5 libsasl2-2 libselinux1 libsepol1 libss2 libstdc++6
-  libstdc++6-4.1-dev libuuid1 login nano passwd readline-common tzdata
-  vim-common vim-tiny
-39 upgraded, 3 newly installed, 2 to remove and 0 not upgraded.
-Need to get 23.6MB of archives.
-After unpacking 1798kB disk space will be freed.
+  libgnutls13 libsasl2-2 libselinux1 libsepol1 libss2 libstdc++6
+  libstdc++6-4.1-dev libuuid1 login nano passwd tzdata vim-common vim-tiny
+36 upgraded, 3 newly installed, 2 to remove and 0 not upgraded.
+Need to get 23.3MB of archives.
+After unpacking 1712kB disk space will be freed.
 Get:1 http://cdn.debian.or.jp sid/main gcc-4.2-base 4.2-20070528-1 [208kB]
 Get:2 http://cdn.debian.or.jp sid/main libc6-dev 2.5-10 [2473kB]
 Get:3 http://cdn.debian.or.jp sid/main libc6 2.5-10 [4890kB]
@@ -42,38 +41,35 @@ Get:8 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-11 [424kB]
 Get:9 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-11 [2514kB]
 Get:10 http://cdn.debian.or.jp sid/main gcc-4.1-base 4.1.2-11 [202kB]
 Get:11 http://cdn.debian.or.jp sid/main debianutils 2.20.1 [52.9kB]
-Get:12 http://cdn.debian.or.jp sid/main cpio 2.7-3 [115kB]
-Get:13 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.4 [178kB]
-Get:14 http://cdn.debian.or.jp sid/main dpkg 1.14.4 [2080kB]
-Get:15 http://cdn.debian.or.jp sid/main e2fslibs 1.39+1.40-WIP-2007.04.07+dfsg-2 [111kB]
-Get:16 http://cdn.debian.or.jp sid/main e2fsprogs 1.39+1.40-WIP-2007.04.07+dfsg-2 [612kB]
-Get:17 http://cdn.debian.or.jp sid/main findutils 4.2.31-1 [436kB]
-Get:18 http://cdn.debian.or.jp sid/main login 1:4.0.18.1-9 [798kB]
-Get:19 http://cdn.debian.or.jp sid/main debian-archive-keyring 2007.02.19-0.1 [8088B]
-Get:20 http://cdn.debian.or.jp sid/main libsepol1 2.0.3-1 [126kB]
-Get:21 http://cdn.debian.or.jp sid/main libselinux1 2.0.15-2 [66.6kB]
-Get:22 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.18-1 [47.4kB]
-Get:23 http://cdn.debian.or.jp sid/main libblkid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [45.2kB]
-Get:24 http://cdn.debian.or.jp sid/main libcomerr2 1.39+1.40-WIP-2007.04.07+dfsg-2 [33.1kB]
-Get:25 http://cdn.debian.or.jp sid/main libss2 1.39+1.40-WIP-2007.04.07+dfsg-2 [39.0kB]
-Get:26 http://cdn.debian.or.jp sid/main libuuid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [34.0kB]
-Get:27 http://cdn.debian.or.jp sid/main tzdata 2007f-7 [386kB]
-Get:28 http://cdn.debian.or.jp sid/main laptop-detect 0.13.1 [4574B]
-Get:29 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
-Get:30 http://cdn.debian.or.jp sid/main liblzo2-2 2.02-2 [54.7kB]
-Get:31 http://cdn.debian.or.jp sid/main libgnutls13 1.6.3-1 [354kB]
-Get:32 http://cdn.debian.or.jp sid/main readline-common 5.2-3 [50.8kB]
-Get:33 http://cdn.debian.or.jp sid/main libreadline5 5.2-3 [144kB]
-Get:34 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-10 [107kB]
-Get:35 http://cdn.debian.or.jp sid/main nano 2.0.6-2 [572kB]
-Get:36 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-000+1 [618kB]
-Get:37 http://cdn.debian.or.jp sid/main vim-common 1:7.1-000+1 [179kB]
-Get:38 http://cdn.debian.or.jp sid/main dselect 1.14.4 [500kB]
-Get:39 http://cdn.debian.or.jp sid/main passwd 1:4.0.18.1-9 [788kB]
-Get:40 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-2 [11.9kB]
-Get:41 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-2 [5056B]
-Get:42 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-2 [1374B]
-
Extracting templates from packages: 71%
Extracting templates from packages: 100%
+Get:12 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.4 [178kB]
+Get:13 http://cdn.debian.or.jp sid/main dpkg 1.14.4 [2080kB]
+Get:14 http://cdn.debian.or.jp sid/main e2fslibs 1.39+1.40-WIP-2007.04.07+dfsg-2 [111kB]
+Get:15 http://cdn.debian.or.jp sid/main e2fsprogs 1.39+1.40-WIP-2007.04.07+dfsg-2 [612kB]
+Get:16 http://cdn.debian.or.jp sid/main findutils 4.2.31-1 [436kB]
+Get:17 http://cdn.debian.or.jp sid/main login 1:4.0.18.1-9 [798kB]
+Get:18 http://cdn.debian.or.jp sid/main debian-archive-keyring 2007.02.19-0.1 [8088B]
+Get:19 http://cdn.debian.or.jp sid/main libsepol1 2.0.3-1 [126kB]
+Get:20 http://cdn.debian.or.jp sid/main libselinux1 2.0.15-2 [66.6kB]
+Get:21 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.18-1 [47.4kB]
+Get:22 http://cdn.debian.or.jp sid/main libblkid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [45.2kB]
+Get:23 http://cdn.debian.or.jp sid/main libcomerr2 1.39+1.40-WIP-2007.04.07+dfsg-2 [33.1kB]
+Get:24 http://cdn.debian.or.jp sid/main libss2 1.39+1.40-WIP-2007.04.07+dfsg-2 [39.0kB]
+Get:25 http://cdn.debian.or.jp sid/main libuuid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [34.0kB]
+Get:26 http://cdn.debian.or.jp sid/main tzdata 2007f-8 [386kB]
+Get:27 http://cdn.debian.or.jp sid/main laptop-detect 0.13.1 [4574B]
+Get:28 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
+Get:29 http://cdn.debian.or.jp sid/main liblzo2-2 2.02-2 [54.7kB]
+Get:30 http://cdn.debian.or.jp sid/main libgnutls13 1.6.3-1 [354kB]
+Get:31 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-10 [107kB]
+Get:32 http://cdn.debian.or.jp sid/main nano 2.0.6-2 [572kB]
+Get:33 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-000+1 [618kB]
+Get:34 http://cdn.debian.or.jp sid/main vim-common 1:7.1-000+1 [179kB]
+Get:35 http://cdn.debian.or.jp sid/main dselect 1.14.4 [500kB]
+Get:36 http://cdn.debian.or.jp sid/main passwd 1:4.0.18.1-9 [788kB]
+Get:37 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-2 [11.9kB]
+Get:38 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-2 [5056B]
+Get:39 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-2 [1374B]
+
Extracting templates from packages: 76%
Extracting templates from packages: 100%
 Preconfiguring packages ...
 Fetched XXXB in Xs (XXXXXB/s)
 (Reading database ... 12102 files and directories currently installed.)
@@ -119,8 +115,6 @@ Unpacking replacement debianutils ...
 Setting up debianutils (2.20.1) ...
 
 (Reading database ... 12100 files and directories currently installed.)
-Preparing to replace cpio 2.7-1 (using .../archives/cpio_2.7-3_amd64.deb) ...
-Unpacking replacement cpio ...
 Preparing to replace dpkg-dev 1.13.25 (using .../dpkg-dev_1.14.4_all.deb) ...
 Unpacking replacement dpkg-dev ...
 Preparing to replace dpkg 1.13.25 (using .../archives/dpkg_1.14.4_amd64.deb) ...
@@ -194,9 +188,9 @@ Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 
 (Reading database ... 12105 files and directories currently installed.)
-Preparing to replace tzdata 2007f-3 (using .../tzdata_2007f-7_all.deb) ...
+Preparing to replace tzdata 2007f-3 (using .../tzdata_2007f-8_all.deb) ...
 Unpacking replacement tzdata ...
-Setting up tzdata (2007f-7) ...
+Setting up tzdata (2007f-8) ...
 
 User defined timezone, leaving /etc/localtime unchanged.
 Local time is now: XXXX
@@ -213,10 +207,6 @@ Selecting previously deselected package liblzo2-2.
 Unpacking liblzo2-2 (from .../liblzo2-2_2.02-2_amd64.deb) ...
 Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.6.3-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
-Preparing to replace readline-common 5.2-2 (using .../readline-common_5.2-3_all.deb) ...
-Unpacking replacement readline-common ...
-Preparing to replace libreadline5 5.2-2 (using .../libreadline5_5.2-3_amd64.deb) ...
-Unpacking replacement libreadline5 ...
 Preparing to replace libsasl2-2 2.1.22.dfsg1-8 (using .../libsasl2-2_2.1.22.dfsg1-10_amd64.deb) ...
 Unpacking replacement libsasl2-2 ...
 Preparing to replace nano 2.0.3-1 (using .../nano_2.0.6-2_amd64.deb) ...
@@ -241,8 +231,6 @@ Setting up gcc-4.1-base (4.1.2-11) ...
 
 Setting up cpp-4.1 (4.1.2-11) ...
 Setting up gcc-4.1 (4.1.2-11) ...
-Setting up cpio (2.7-3) ...
-
 Setting up dpkg-dev (1.14.4) ...
 Setting up laptop-detect (0.13.1) ...
 Setting up libbz2-1.0 (1.0.3-7) ...
@@ -251,10 +239,6 @@ Setting up liblzo2-2 (2.02-2) ...
 
 Setting up libgnutls13 (1.6.3-1) ...
 
-Setting up readline-common (5.2-3) ...
-
-Setting up libreadline5 (5.2-3) ...
-
 Setting up libsasl2-2 (2.1.22.dfsg1-10) ...
 
 Setting up nano (2.0.6-2) ...
diff --git a/testsuite/normal/pbuilder-update-lenny-sid-experimental.log b/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
index 989ffc6..9bbac80 100644
--- a/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
@@ -15,7 +15,7 @@ Get:2 http://cdn.debian.or.jp experimental Release.gpg [189B]
 Hit http://cdn.debian.or.jp sid Release
 Get:3 http://cdn.debian.or.jp experimental Release [79.6kB]
 Get:4 http://cdn.debian.or.jp sid/main Packages/DiffIndex [2038B]
-Get:5 http://cdn.debian.or.jp experimental/main Packages [228kB]
+Get:5 http://cdn.debian.or.jp experimental/main Packages [232kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -38,15 +38,15 @@ Get:2 http://cdn.debian.or.jp experimental/main libc6-dev 2.6-0exp2 [2474kB]
 Get:3 http://cdn.debian.or.jp experimental/main libc6 2.6-0exp2 [4753kB]
 Get:4 http://cdn.debian.or.jp experimental/main coreutils 6.0-1 [3141kB]
 Get:5 http://cdn.debian.or.jp experimental/main findutils 4.3.6-1 [606kB]
-Get:6 http://cdn.debian.or.jp experimental/main ncurses-bin 5.6+20070526-1 [160kB]
-Get:7 http://cdn.debian.or.jp experimental/main libncurses5 5.6+20070526-1 [338kB]
+Get:6 http://cdn.debian.or.jp experimental/main ncurses-bin 5.6+20070602-1 [160kB]
+Get:7 http://cdn.debian.or.jp experimental/main libncurses5 5.6+20070602-1 [339kB]
 Get:8 http://cdn.debian.or.jp experimental/main ncurses-base 5.6+20070602-1 [12.9kB]
 Get:9 http://cdn.debian.or.jp experimental/main apt-utils 0.7.0 [192kB]
 Get:10 http://cdn.debian.or.jp experimental/main apt 0.7.0 [1453kB]
 Get:11 http://cdn.debian.or.jp experimental/main libgcrypt11 1.3.0-1 [233kB]
 Get:12 http://cdn.debian.or.jp experimental/main libopencdk10 0.6.1-1 [84.7kB]
 Get:13 http://cdn.debian.or.jp experimental/main libgnutls13 1.7.9-1 [381kB]
-Get:14 http://cdn.debian.or.jp experimental/main libncursesw5 5.6+20070526-1 [359kB]
+Get:14 http://cdn.debian.or.jp experimental/main libncursesw5 5.6+20070602-1 [360kB]
 Get:15 http://cdn.debian.or.jp experimental/main wget 1.10.2+1.11.beta1-1 [635kB]
 Get:16 http://cdn.debian.or.jp experimental/main binutils 2.17.20070406cvs-2 [2730kB]
 Get:17 http://cdn.debian.or.jp sid/main cpp-4.2 4.2-20070528-1 [2702kB]
@@ -88,13 +88,13 @@ Unpacking replacement findutils ...
 Setting up findutils (4.3.6-1) ...
 
 (Reading database ... 10848 files and directories currently installed.)
-Preparing to replace ncurses-bin 5.6-3 (using .../ncurses-bin_5.6+20070526-1_amd64.deb) ...
+Preparing to replace ncurses-bin 5.6-3 (using .../ncurses-bin_5.6+20070602-1_amd64.deb) ...
 Unpacking replacement ncurses-bin ...
-Setting up ncurses-bin (5.6+20070526-1) ...
+Setting up ncurses-bin (5.6+20070602-1) ...
 (Reading database ... 10847 files and directories currently installed.)
-Preparing to replace libncurses5 5.6-3 (using .../libncurses5_5.6+20070526-1_amd64.deb) ...
+Preparing to replace libncurses5 5.6-3 (using .../libncurses5_5.6+20070602-1_amd64.deb) ...
 Unpacking replacement libncurses5 ...
-Setting up libncurses5 (5.6+20070526-1) ...
+Setting up libncurses5 (5.6+20070602-1) ...
 
 (Reading database ... 10847 files and directories currently installed.)
 Preparing to replace ncurses-base 5.6-3 (using .../ncurses-base_5.6+20070602-1_all.deb) ...
@@ -121,7 +121,7 @@ Selecting previously deselected package libopencdk10.
 Unpacking libopencdk10 (from .../libopencdk10_0.6.1-1_amd64.deb) ...
 Preparing to replace libgnutls13 1.6.3-1 (using .../libgnutls13_1.7.9-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
-Preparing to replace libncursesw5 5.6-3 (using .../libncursesw5_5.6+20070526-1_amd64.deb) ...
+Preparing to replace libncursesw5 5.6-3 (using .../libncursesw5_5.6+20070602-1_amd64.deb) ...
 Unpacking replacement libncursesw5 ...
 Preparing to replace wget 1.10.2-2 (using .../wget_1.10.2+1.11.beta1-1_amd64.deb) ...
 Unpacking replacement wget ...
@@ -154,7 +154,7 @@ Setting up libopencdk10 (0.6.1-1) ...
 
 Setting up libgnutls13 (1.7.9-1) ...
 
-Setting up libncursesw5 (5.6+20070526-1) ...
+Setting up libncursesw5 (5.6+20070602-1) ...
 
 Setting up wget (1.10.2+1.11.beta1-1) ...
 
diff --git a/testsuite/normal/pbuilder-update-lenny-sid.log b/testsuite/normal/pbuilder-update-lenny-sid.log
index 4a13c5e..26d9861 100644
--- a/testsuite/normal/pbuilder-update-lenny-sid.log
+++ b/testsuite/normal/pbuilder-update-lenny-sid.log
@@ -11,7 +11,7 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp sid Release [79.6kB]
-Get:3 http://cdn.debian.or.jp sid/main Packages [6246kB]
+Get:3 http://cdn.debian.or.jp sid/main Packages [6251kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -22,15 +22,14 @@ The following packages will be REMOVED:
 The following NEW packages will be installed:
   gcc-4.2-base libdevmapper1.02.1 liblzo2-2
 The following packages will be upgraded:
-  cpio cpp cpp-4.1 debian-archive-keyring debianutils dpkg dpkg-dev dselect
+  cpp cpp-4.1 debian-archive-keyring debianutils dpkg dpkg-dev dselect
   e2fslibs e2fsprogs findutils g++ g++-4.1 gcc gcc-4.1 gcc-4.1-base
   laptop-detect libblkid1 libbz2-1.0 libc6 libc6-dev libcomerr2 libgcc1
-  libgnutls13 libreadline5 libsasl2-2 libselinux1 libsepol1 libss2 libstdc++6
-  libstdc++6-4.1-dev libuuid1 login nano passwd readline-common tzdata
-  vim-common vim-tiny
-39 upgraded, 3 newly installed, 2 to remove and 0 not upgraded.
-Need to get 23.6MB of archives.
-After unpacking 1798kB disk space will be freed.
+  libgnutls13 libsasl2-2 libselinux1 libsepol1 libss2 libstdc++6
+  libstdc++6-4.1-dev libuuid1 login nano passwd tzdata vim-common vim-tiny
+36 upgraded, 3 newly installed, 2 to remove and 0 not upgraded.
+Need to get 23.3MB of archives.
+After unpacking 1712kB disk space will be freed.
 Get:1 http://cdn.debian.or.jp sid/main gcc-4.2-base 4.2-20070528-1 [208kB]
 Get:2 http://cdn.debian.or.jp sid/main libc6-dev 2.5-10 [2473kB]
 Get:3 http://cdn.debian.or.jp sid/main libc6 2.5-10 [4890kB]
@@ -42,38 +41,35 @@ Get:8 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-11 [424kB]
 Get:9 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-11 [2514kB]
 Get:10 http://cdn.debian.or.jp sid/main gcc-4.1-base 4.1.2-11 [202kB]
 Get:11 http://cdn.debian.or.jp sid/main debianutils 2.20.1 [52.9kB]
-Get:12 http://cdn.debian.or.jp sid/main cpio 2.7-3 [115kB]
-Get:13 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.4 [178kB]
-Get:14 http://cdn.debian.or.jp sid/main dpkg 1.14.4 [2080kB]
-Get:15 http://cdn.debian.or.jp sid/main e2fslibs 1.39+1.40-WIP-2007.04.07+dfsg-2 [111kB]
-Get:16 http://cdn.debian.or.jp sid/main e2fsprogs 1.39+1.40-WIP-2007.04.07+dfsg-2 [612kB]
-Get:17 http://cdn.debian.or.jp sid/main findutils 4.2.31-1 [436kB]
-Get:18 http://cdn.debian.or.jp sid/main login 1:4.0.18.1-9 [798kB]
-Get:19 http://cdn.debian.or.jp sid/main debian-archive-keyring 2007.02.19-0.1 [8088B]
-Get:20 http://cdn.debian.or.jp sid/main libsepol1 2.0.3-1 [126kB]
-Get:21 http://cdn.debian.or.jp sid/main libselinux1 2.0.15-2 [66.6kB]
-Get:22 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.18-1 [47.4kB]
-Get:23 http://cdn.debian.or.jp sid/main libblkid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [45.2kB]
-Get:24 http://cdn.debian.or.jp sid/main libcomerr2 1.39+1.40-WIP-2007.04.07+dfsg-2 [33.1kB]
-Get:25 http://cdn.debian.or.jp sid/main libss2 1.39+1.40-WIP-2007.04.07+dfsg-2 [39.0kB]
-Get:26 http://cdn.debian.or.jp sid/main libuuid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [34.0kB]
-Get:27 http://cdn.debian.or.jp sid/main tzdata 2007f-7 [386kB]
-Get:28 http://cdn.debian.or.jp sid/main laptop-detect 0.13.1 [4574B]
-Get:29 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
-Get:30 http://cdn.debian.or.jp sid/main liblzo2-2 2.02-2 [54.7kB]
-Get:31 http://cdn.debian.or.jp sid/main libgnutls13 1.6.3-1 [354kB]
-Get:32 http://cdn.debian.or.jp sid/main readline-common 5.2-3 [50.8kB]
-Get:33 http://cdn.debian.or.jp sid/main libreadline5 5.2-3 [144kB]
-Get:34 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-10 [107kB]
-Get:35 http://cdn.debian.or.jp sid/main nano 2.0.6-2 [572kB]
-Get:36 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-000+1 [618kB]
-Get:37 http://cdn.debian.or.jp sid/main vim-common 1:7.1-000+1 [179kB]
-Get:38 http://cdn.debian.or.jp sid/main dselect 1.14.4 [500kB]
-Get:39 http://cdn.debian.or.jp sid/main passwd 1:4.0.18.1-9 [788kB]
-Get:40 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-2 [11.9kB]
-Get:41 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-2 [5056B]
-Get:42 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-2 [1374B]
-
Extracting templates from packages: 71%
Extracting templates from packages: 100%
+Get:12 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.4 [178kB]
+Get:13 http://cdn.debian.or.jp sid/main dpkg 1.14.4 [2080kB]
+Get:14 http://cdn.debian.or.jp sid/main e2fslibs 1.39+1.40-WIP-2007.04.07+dfsg-2 [111kB]
+Get:15 http://cdn.debian.or.jp sid/main e2fsprogs 1.39+1.40-WIP-2007.04.07+dfsg-2 [612kB]
+Get:16 http://cdn.debian.or.jp sid/main findutils 4.2.31-1 [436kB]
+Get:17 http://cdn.debian.or.jp sid/main login 1:4.0.18.1-9 [798kB]
+Get:18 http://cdn.debian.or.jp sid/main debian-archive-keyring 2007.02.19-0.1 [8088B]
+Get:19 http://cdn.debian.or.jp sid/main libsepol1 2.0.3-1 [126kB]
+Get:20 http://cdn.debian.or.jp sid/main libselinux1 2.0.15-2 [66.6kB]
+Get:21 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.18-1 [47.4kB]
+Get:22 http://cdn.debian.or.jp sid/main libblkid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [45.2kB]
+Get:23 http://cdn.debian.or.jp sid/main libcomerr2 1.39+1.40-WIP-2007.04.07+dfsg-2 [33.1kB]
+Get:24 http://cdn.debian.or.jp sid/main libss2 1.39+1.40-WIP-2007.04.07+dfsg-2 [39.0kB]
+Get:25 http://cdn.debian.or.jp sid/main libuuid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [34.0kB]
+Get:26 http://cdn.debian.or.jp sid/main tzdata 2007f-8 [386kB]
+Get:27 http://cdn.debian.or.jp sid/main laptop-detect 0.13.1 [4574B]
+Get:28 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
+Get:29 http://cdn.debian.or.jp sid/main liblzo2-2 2.02-2 [54.7kB]
+Get:30 http://cdn.debian.or.jp sid/main libgnutls13 1.6.3-1 [354kB]
+Get:31 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-10 [107kB]
+Get:32 http://cdn.debian.or.jp sid/main nano 2.0.6-2 [572kB]
+Get:33 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-000+1 [618kB]
+Get:34 http://cdn.debian.or.jp sid/main vim-common 1:7.1-000+1 [179kB]
+Get:35 http://cdn.debian.or.jp sid/main dselect 1.14.4 [500kB]
+Get:36 http://cdn.debian.or.jp sid/main passwd 1:4.0.18.1-9 [788kB]
+Get:37 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-2 [11.9kB]
+Get:38 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-2 [5056B]
+Get:39 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-2 [1374B]
+
Extracting templates from packages: 76%
Extracting templates from packages: 100%
 Preconfiguring packages ...
 Fetched XXXB in Xs (XXXXXB/s)
 (Reading database ... 12101 files and directories currently installed.)
@@ -119,8 +115,6 @@ Unpacking replacement debianutils ...
 Setting up debianutils (2.20.1) ...
 
 (Reading database ... 12099 files and directories currently installed.)
-Preparing to replace cpio 2.7-1 (using .../archives/cpio_2.7-3_amd64.deb) ...
-Unpacking replacement cpio ...
 Preparing to replace dpkg-dev 1.13.25 (using .../dpkg-dev_1.14.4_all.deb) ...
 Unpacking replacement dpkg-dev ...
 Preparing to replace dpkg 1.13.25 (using .../archives/dpkg_1.14.4_amd64.deb) ...
@@ -194,9 +188,9 @@ Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 
 (Reading database ... 12104 files and directories currently installed.)
-Preparing to replace tzdata 2007f-3 (using .../tzdata_2007f-7_all.deb) ...
+Preparing to replace tzdata 2007f-3 (using .../tzdata_2007f-8_all.deb) ...
 Unpacking replacement tzdata ...
-Setting up tzdata (2007f-7) ...
+Setting up tzdata (2007f-8) ...
 
 Current default timezone: 'Etc/UTC'
 Local time is now: XXXX
@@ -213,10 +207,6 @@ Selecting previously deselected package liblzo2-2.
 Unpacking liblzo2-2 (from .../liblzo2-2_2.02-2_amd64.deb) ...
 Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.6.3-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
-Preparing to replace readline-common 5.2-2 (using .../readline-common_5.2-3_all.deb) ...
-Unpacking replacement readline-common ...
-Preparing to replace libreadline5 5.2-2 (using .../libreadline5_5.2-3_amd64.deb) ...
-Unpacking replacement libreadline5 ...
 Preparing to replace libsasl2-2 2.1.22.dfsg1-8 (using .../libsasl2-2_2.1.22.dfsg1-10_amd64.deb) ...
 Unpacking replacement libsasl2-2 ...
 Preparing to replace nano 2.0.3-1 (using .../nano_2.0.6-2_amd64.deb) ...
@@ -241,8 +231,6 @@ Setting up gcc-4.1-base (4.1.2-11) ...
 
 Setting up cpp-4.1 (4.1.2-11) ...
 Setting up gcc-4.1 (4.1.2-11) ...
-Setting up cpio (2.7-3) ...
-
 Setting up dpkg-dev (1.14.4) ...
 Setting up laptop-detect (0.13.1) ...
 Setting up libbz2-1.0 (1.0.3-7) ...
@@ -251,10 +239,6 @@ Setting up liblzo2-2 (2.02-2) ...
 
 Setting up libgnutls13 (1.6.3-1) ...
 
-Setting up readline-common (5.2-3) ...
-
-Setting up libreadline5 (5.2-3) ...
-
 Setting up libsasl2-2 (2.1.22.dfsg1-10) ...
 
 Setting up nano (2.0.6-2) ...
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index f7298bb..11842c7 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -427,11 +427,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
-Mon Jun  4 03:10:51 UTC 2007
+Tue Jun  5 03:10:09 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,13 +501,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
-Mon Jun  4 03:10:56 UTC 2007
+Tue Jun  5 03:10:14 UTC 2007
 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
diff --git a/testsuite/normal/pdebuild-internal-lenny.log b/testsuite/normal/pdebuild-internal-lenny.log
index bc4411a..074cf30 100644
--- a/testsuite/normal/pdebuild-internal-lenny.log
+++ b/testsuite/normal/pdebuild-internal-lenny.log
@@ -418,8 +418,8 @@ 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
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -431,7 +431,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
-Mon Jun  4 03:19:01 UTC 2007
+Tue Jun  5 03:19:00 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,13 +501,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Mon Jun  4 03:19:06 UTC 2007
+Tue Jun  5 03:19:05 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 c: c
 dsh: Process terminated (before write).
-a: a
 b: b
 PASS: tests/segv-catcher.sh
 l w
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index ff740bb..567df5b 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -416,10 +416,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
+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
@@ -431,7 +431,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
-Mon Jun  4 03:05:49 UTC 2007
+Tue Jun  5 03:05:24 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,14 +501,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
-Mon Jun  4 03:05:54 UTC 2007
+Tue Jun  5 03:05:29 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-c: c
-dsh: Process terminated (before write).
 a: a
 b: b
+c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index 87ee172..ebd6967 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -438,7 +438,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
-Mon Jun  4 03:10:00 UTC 2007
+Tue Jun  5 03:09:21 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -508,14 +508,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Mon Jun  4 03:10:05 UTC 2007
+Tue Jun  5 03:09:26 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
+a: a
 c: c
-dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pdebuild-normal-lenny.log b/testsuite/normal/pdebuild-normal-lenny.log
index b67c3a4..4226641 100644
--- a/testsuite/normal/pdebuild-normal-lenny.log
+++ b/testsuite/normal/pdebuild-normal-lenny.log
@@ -424,8 +424,8 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -438,7 +438,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
-Mon Jun  4 03:18:10 UTC 2007
+Tue Jun  5 03:18:06 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -508,14 +508,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
-Mon Jun  4 03:18:15 UTC 2007
+Tue Jun  5 03:18:11 UTC 2007
 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
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 77b603a..6644745 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -437,7 +437,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
-Mon Jun  4 03:04:56 UTC 2007
+Tue Jun  5 03:04:26 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -507,13 +507,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Mon Jun  4 03:05:02 UTC 2007
+Tue Jun  5 03:04:31 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-c: c
 b: b
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh