General file updates.

author: Junichi Uekawa <dancer@netfort.gr.jp> 2009-05-31 10:49:03 +0900
committer: Junichi Uekawa <dancer@netfort.gr.jp> 2009-05-31 10:49:03 +0900
commit: 5b9a957c236043d2bacd8badda61669049518343 (patch)
tree: f99e94628f632120db20a6adc7e3822c548f7ea0 /testsuite/normal
parent: 0ac8590bd15c7fa9c5e3f5625ad6d1c3c95fb608 (diff)
download: pbuilder-5b9a957c236043d2bacd8badda61669049518343.tar
pbuilder-5b9a957c236043d2bacd8badda61669049518343.tar.gz
16 files changed, 1167 insertions, 1009 deletions
diff --git a/testsuite/normal/pbuilder-build-dsh-lenny.log b/testsuite/normal/pbuilder-build-dsh-lenny.log
index 79ae642..9f6ca93 100644
--- a/testsuite/normal/pbuilder-build-dsh-lenny.log
+++ b/testsuite/normal/pbuilder-build-dsh-lenny.log
@@ -1,6 +1,6 @@
 I: using fakeroot in build.
-I: Current time: Thu Feb 26 13:44:01 JST 2009
-I: pbuilder-time-stamp: 1235623441
+I: Current time: Sat Mar 21 11:23:22 JST 2009
+I: pbuilder-time-stamp: 1237602202
 I: Building the build Environment
 I: extracting base tarball [/TESTDIR/testimage]
 I: creating local configuration
@@ -72,60 +72,60 @@ Get:16 http://localhost lenny/main sp 1.3.4-1.2.1-47 [182kB]
 Get:17 http://localhost lenny/main po4a 0.34-2 [847kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
-Selecting previously deselected package libmagic1.
-(Reading database ... 9656 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.26-1_amd64.deb) ...
-Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.26-1_amd64.deb) ...
-Selecting previously deselected package html2text.
-Unpacking html2text (from .../html2text_1.3.2a-5_amd64.deb) ...
-Selecting previously deselected package gettext-base.
-Unpacking gettext-base (from .../gettext-base_0.17-4_amd64.deb) ...
-Selecting previously deselected package gettext.
-Unpacking gettext (from .../gettext_0.17-4_amd64.deb) ...
-Selecting previously deselected package intltool-debian.
-Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) ...
-Selecting previously deselected package po-debconf.
-Unpacking po-debconf (from .../po-debconf_1.0.15_all.deb) ...
-Selecting previously deselected package groff-base.
-Unpacking groff-base (from .../groff-base_1.18.1.1-21_amd64.deb) ...
-Selecting previously deselected package bsdmainutils.
-Unpacking bsdmainutils (from .../bsdmainutils_6.1.10_amd64.deb) ...
-Selecting previously deselected package man-db.
-Unpacking man-db (from .../man-db_2.5.2-4_amd64.deb) ...
-Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_7.0.15_all.deb) ...
-Selecting previously deselected package libdshconfig1.
-Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_amd64.deb) ...
-Selecting previously deselected package libdshconfig1-dev.
-Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.13-1_amd64.deb) ...
-Selecting previously deselected package libsgmls-perl.
-Unpacking libsgmls-perl (from .../libsgmls-perl_1.03ii-32_all.deb) ...
-Selecting previously deselected package libsp1c2.
-Unpacking libsp1c2 (from .../libsp1c2_1.3.4-1.2.1-47_amd64.deb) ...
-Selecting previously deselected package sp.
-Unpacking sp (from .../sp_1.3.4-1.2.1-47_amd64.deb) ...
-Selecting previously deselected package po4a.
-Unpacking po4a (from .../archives/po4a_0.34-2_all.deb) ...
-Setting up libmagic1 (4.26-1) ...
-Setting up file (4.26-1) ...
-Setting up html2text (1.3.2a-5) ...
-Setting up gettext-base (0.17-4) ...
-Setting up gettext (0.17-4) ...
-Setting up intltool-debian (0.35.0+20060710.1) ...
-Setting up po-debconf (1.0.15) ...
-Setting up groff-base (1.18.1.1-21) ...
-Setting up bsdmainutils (6.1.10) ...
-Setting up man-db (2.5.2-4) ...
-Building database of manual pages ...
-Setting up debhelper (7.0.15) ...
-Setting up libdshconfig1 (0.20.13-1) ...
-Setting up libdshconfig1-dev (0.20.13-1) ...
-Setting up libsgmls-perl (1.03ii-32) ...
-Setting up libsp1c2 (1.3.4-1.2.1-47) ...
-Setting up sp (1.3.4-1.2.1-47) ...
-Setting up po4a (0.34-2) ...
-Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE LIBMAGIC1.
+(READING DATABASE ... 9656 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+UNPACKING LIBMAGIC1 (FROM .../LIBMAGIC1_4.26-1_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE FILE.
+UNPACKING FILE (FROM .../ARCHIVES/FILE_4.26-1_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE HTML2TEXT.
+UNPACKING HTML2TEXT (FROM .../HTML2TEXT_1.3.2A-5_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE GETTEXT-BASE.
+UNPACKING GETTEXT-BASE (FROM .../GETTEXT-BASE_0.17-4_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE GETTEXT.
+UNPACKING GETTEXT (FROM .../GETTEXT_0.17-4_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE INTLTOOL-DEBIAN.
+UNPACKING INTLTOOL-DEBIAN (FROM .../INTLTOOL-DEBIAN_0.35.0+20060710.1_ALL.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE PO-DEBCONF.
+UNPACKING PO-DEBCONF (FROM .../PO-DEBCONF_1.0.15_ALL.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE GROFF-BASE.
+UNPACKING GROFF-BASE (FROM .../GROFF-BASE_1.18.1.1-21_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE BSDMAINUTILS.
+UNPACKING BSDMAINUTILS (FROM .../BSDMAINUTILS_6.1.10_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE MAN-DB.
+UNPACKING MAN-DB (FROM .../MAN-DB_2.5.2-4_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE DEBHELPER.
+UNPACKING DEBHELPER (FROM .../DEBHELPER_7.0.15_ALL.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE LIBDSHCONFIG1.
+UNPACKING LIBDSHCONFIG1 (FROM .../LIBDSHCONFIG1_0.20.13-1_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE LIBDSHCONFIG1-DEV.
+UNPACKING LIBDSHCONFIG1-DEV (FROM .../LIBDSHCONFIG1-DEV_0.20.13-1_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE LIBSGMLS-PERL.
+UNPACKING LIBSGMLS-PERL (FROM .../LIBSGMLS-PERL_1.03II-32_ALL.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE LIBSP1C2.
+UNPACKING LIBSP1C2 (FROM .../LIBSP1C2_1.3.4-1.2.1-47_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE SP.
+UNPACKING SP (FROM .../SP_1.3.4-1.2.1-47_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE PO4A.
+UNPACKING PO4A (FROM .../ARCHIVES/PO4A_0.34-2_ALL.DEB) ...
+SETTING UP LIBMAGIC1 (4.26-1) ...
+SETTING UP FILE (4.26-1) ...
+SETTING UP HTML2TEXT (1.3.2A-5) ...
+SETTING UP GETTEXT-BASE (0.17-4) ...
+SETTING UP GETTEXT (0.17-4) ...
+SETTING UP INTLTOOL-DEBIAN (0.35.0+20060710.1) ...
+SETTING UP PO-DEBCONF (1.0.15) ...
+SETTING UP GROFF-BASE (1.18.1.1-21) ...
+SETTING UP BSDMAINUTILS (6.1.10) ...
+SETTING UP MAN-DB (2.5.2-4) ...
+BUILDING DATABASE OF MANUAL PAGES ...
+SETTING UP DEBHELPER (7.0.15) ...
+SETTING UP LIBDSHCONFIG1 (0.20.13-1) ...
+SETTING UP LIBDSHCONFIG1-DEV (0.20.13-1) ...
+SETTING UP LIBSGMLS-PERL (1.03II-32) ...
+SETTING UP LIBSP1C2 (1.3.4-1.2.1-47) ...
+SETTING UP SP (1.3.4-1.2.1-47) ...
+SETTING UP PO4A (0.34-2) ...
+SETTING UP PBUILDER-SATISFYDEPENDS-DUMMY (0.INVALID.0) ...
 Reading package lists...
 Building dependency tree...
 Reading state information...
@@ -468,11 +468,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
-Thu Feb 26 04:44:56 UTC 2009
+Sat Mar 21 02:24:14 UTC 2009
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -542,12 +542,11 @@ 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
-Thu Feb 26 04:45:01 UTC 2009
+Sat Mar 21 02:24:19 UTC 2009
 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
 PASS: tests/segv-catcher.sh
@@ -644,5 +643,5 @@ I: unmounting dev/pts filesystem
 I: unmounting proc filesystem
 I: cleaning the build env 
 I: removing directory /TESTDIR/dir1/NUM and its subdirectories
-I: Current time: Thu Feb 26 13:45:05 JST 2009
-I: pbuilder-time-stamp: 1235623505
+I: Current time: Sat Mar 21 11:24:23 JST 2009
+I: pbuilder-time-stamp: 1237602263
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index c043b4f..180e582 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -1,6 +1,6 @@
 I: using fakeroot in build.
-I: Current time: Thu Feb 26 13:37:09 JST 2009
-I: pbuilder-time-stamp: 1235623029
+I: Current time: Sat Mar 21 11:14:36 JST 2009
+I: pbuilder-time-stamp: 1237601676
 I: Building the build Environment
 I: extracting base tarball [/TESTDIR/testimage]
 I: creating local configuration
@@ -25,7 +25,7 @@ Reading state information...
 aptitude is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Selecting previously deselected package pbuilder-satisfydepends-dummy.
-(Reading database ... 9767 files and directories currently installed.)
+(Reading database ... 9780 files and directories currently installed.)
 Unpacking pbuilder-satisfydepends-dummy (from .../pbuilder-satisfydepends-dummy.deb) ...
 dpkg: dependency problems prevent configuration of pbuilder-satisfydepends-dummy:
  pbuilder-satisfydepends-dummy depends on debhelper (>> 3.0.0); however:
@@ -52,33 +52,33 @@ The following NEW packages will be installed:
 The following partially installed packages will be configured:
   pbuilder-satisfydepends-dummy 
 0 packages upgraded, 21 newly installed, 0 to remove and 0 not upgraded.
-Need to get 11.2MB of archives. After unpacking 33.1MB will be used.
+Need to get 11.2MB of archives. After unpacking 33.2MB will be used.
 Writing extended state information...
 Get:1 http://localhost sid/main libmagic1 4.26-2 [369kB]
 Get:2 http://localhost sid/main file 4.26-2 [44.8kB]
 Get:3 http://localhost sid/main html2text 1.3.2a-13 [103kB]
 Get:4 http://localhost sid/main libpcre3 7.8-2 [215kB]
-Get:5 http://localhost sid/main libglib2.0-0 2.18.4-2 [844kB]
-Get:6 http://localhost sid/main libxml2 2.6.32.dfsg-5 [860kB]
+Get:5 http://localhost sid/main libglib2.0-0 2.20.0-2 [845kB]
+Get:6 http://localhost sid/main libxml2 2.7.3.dfsg-1 [870kB]
 Get:7 http://localhost sid/main libcroco3 0.6.1-2 [123kB]
 Get:8 http://localhost sid/main gettext-base 0.17-6 [125kB]
 Get:9 http://localhost sid/main gettext 0.17-6 [2710kB]
 Get:10 http://localhost sid/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:11 http://localhost sid/main po-debconf 1.0.15 [237kB]
-Get:12 http://localhost sid/main groff-base 1.18.1.1-21 [898kB]
+Get:12 http://localhost sid/main groff-base 1.18.1.1-22 [897kB]
 Get:13 http://localhost sid/main bsdmainutils 6.1.10 [179kB]
-Get:14 http://localhost sid/main man-db 2.5.4-1 [1386kB]
-Get:15 http://localhost sid/main debhelper 7.0.17 [554kB]
+Get:14 http://localhost sid/main man-db 2.5.5-1 [1387kB]
+Get:15 http://localhost sid/main debhelper 7.2.6 [550kB]
 Get:16 http://localhost sid/main libdshconfig1 0.20.13-1 [11.0kB]
 Get:17 http://localhost sid/main libdshconfig1-dev 0.20.13-1 [25.4kB]
 Get:18 http://localhost sid/main libsgmls-perl 1.03ii-32 [27.8kB]
 Get:19 http://localhost sid/main libsp1c2 1.3.4-1.2.1-47 [1386kB]
 Get:20 http://localhost sid/main sp 1.3.4-1.2.1-47 [182kB]
-Get:21 http://localhost sid/main po4a 0.34-2 [847kB]
+Get:21 http://localhost sid/main po4a 0.36-2 [870kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 9767 files and directories currently installed.)
+(Reading database ... 9780 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.26-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.26-2_amd64.deb) ...
@@ -87,9 +87,9 @@ Unpacking html2text (from .../html2text_1.3.2a-13_amd64.deb) ...
 Selecting previously deselected package libpcre3.
 Unpacking libpcre3 (from .../libpcre3_7.8-2_amd64.deb) ...
 Selecting previously deselected package libglib2.0-0.
-Unpacking libglib2.0-0 (from .../libglib2.0-0_2.18.4-2_amd64.deb) ...
+Unpacking libglib2.0-0 (from .../libglib2.0-0_2.20.0-2_amd64.deb) ...
 Selecting previously deselected package libxml2.
-Unpacking libxml2 (from .../libxml2_2.6.32.dfsg-5_amd64.deb) ...
+Unpacking libxml2 (from .../libxml2_2.7.3.dfsg-1_amd64.deb) ...
 Selecting previously deselected package libcroco3.
 Unpacking libcroco3 (from .../libcroco3_0.6.1-2_amd64.deb) ...
 Selecting previously deselected package gettext-base.
@@ -101,13 +101,13 @@ Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) .
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_1.0.15_all.deb) ...
 Selecting previously deselected package groff-base.
-Unpacking groff-base (from .../groff-base_1.18.1.1-21_amd64.deb) ...
+Unpacking groff-base (from .../groff-base_1.18.1.1-22_amd64.deb) ...
 Selecting previously deselected package bsdmainutils.
 Unpacking bsdmainutils (from .../bsdmainutils_6.1.10_amd64.deb) ...
 Selecting previously deselected package man-db.
-Unpacking man-db (from .../man-db_2.5.4-1_amd64.deb) ...
+Unpacking man-db (from .../man-db_2.5.5-1_amd64.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_7.0.17_all.deb) ...
+Unpacking debhelper (from .../debhelper_7.2.6_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -119,29 +119,29 @@ Unpacking libsp1c2 (from .../libsp1c2_1.3.4-1.2.1-47_amd64.deb) ...
 Selecting previously deselected package sp.
 Unpacking sp (from .../sp_1.3.4-1.2.1-47_amd64.deb) ...
 Selecting previously deselected package po4a.
-Unpacking po4a (from .../archives/po4a_0.34-2_all.deb) ...
+Unpacking po4a (from .../archives/po4a_0.36-2_all.deb) ...
 Setting up libmagic1 (4.26-2) ...
 Setting up file (4.26-2) ...
 Setting up html2text (1.3.2a-13) ...
 Setting up libpcre3 (7.8-2) ...
-Setting up libglib2.0-0 (2.18.4-2) ...
-Setting up libxml2 (2.6.32.dfsg-5) ...
+Setting up libglib2.0-0 (2.20.0-2) ...
+Setting up libxml2 (2.7.3.dfsg-1) ...
 Setting up libcroco3 (0.6.1-2) ...
 Setting up gettext-base (0.17-6) ...
 Setting up gettext (0.17-6) ...
 Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.15) ...
-Setting up groff-base (1.18.1.1-21) ...
+Setting up groff-base (1.18.1.1-22) ...
 Setting up bsdmainutils (6.1.10) ...
-Setting up man-db (2.5.4-1) ...
+Setting up man-db (2.5.5-1) ...
 Building database of manual pages ...
-Setting up debhelper (7.0.17) ...
+Setting up debhelper (7.2.6) ...
 Setting up libdshconfig1 (0.20.13-1) ...
 Setting up libdshconfig1-dev (0.20.13-1) ...
 Setting up libsgmls-perl (1.03ii-32) ...
 Setting up libsp1c2 (1.3.4-1.2.1-47) ...
 Setting up sp (1.3.4-1.2.1-47) ...
-Setting up po4a (0.34-2) ...
+Setting up po4a (0.36-2) ...
 Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ...
 Reading package lists...
 Building dependency tree...
@@ -156,16 +156,16 @@ Reading state information...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 116kB of archives.
+Need to get 117kB of archives.
 After this operation, 467kB of additional disk space will be used.
-Get:1 http://localhost sid/main fakeroot 1.12.1 [116kB]
+Get:1 http://localhost sid/main fakeroot 1.12.2 [117kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11313 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.12.1_amd64.deb) ...
+(Reading database ... 11327 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.12.2_amd64.deb) ...
 Processing triggers for man-db ...
-Setting up fakeroot (1.12.1) ...
+Setting up fakeroot (1.12.2) ...
 I: Copying source file
 I: copying [/TESTDIR/dir1/dsh_0.25.10-1.dsc]
 I: copying [/TESTDIR/dir1/dsh_0.25.10.orig.tar.gz]
@@ -485,11 +485,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
-Thu Feb 26 04:38:08 UTC 2009
+Sat Mar 21 02:16:47 UTC 2009
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -559,13 +559,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
-Thu Feb 26 04:38:13 UTC 2009
+Sat Mar 21 02:16:52 UTC 2009
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
 b: b
+dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -661,5 +661,5 @@ I: unmounting dev/pts filesystem
 I: unmounting proc filesystem
 I: cleaning the build env 
 I: removing directory /TESTDIR/dir1/NUM and its subdirectories
-I: Current time: Thu Feb 26 13:38:17 JST 2009
-I: pbuilder-time-stamp: 1235623097
+I: Current time: Sat Mar 21 11:16:59 JST 2009
+I: pbuilder-time-stamp: 1237601819
diff --git a/testsuite/normal/pbuilder-build-dsh-squeeze.log b/testsuite/normal/pbuilder-build-dsh-squeeze.log
index 033337b..aea45cd 100644
--- a/testsuite/normal/pbuilder-build-dsh-squeeze.log
+++ b/testsuite/normal/pbuilder-build-dsh-squeeze.log
@@ -1,6 +1,6 @@
 I: using fakeroot in build.
-I: Current time: Thu Feb 26 13:55:50 JST 2009
-I: pbuilder-time-stamp: 1235624150
+I: Current time: Sat Mar 21 11:47:26 JST 2009
+I: pbuilder-time-stamp: 1237603646
 I: Building the build Environment
 I: extracting base tarball [/TESTDIR/testimage]
 I: creating local configuration
@@ -25,7 +25,7 @@ Reading state information...
 aptitude is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Selecting previously deselected package pbuilder-satisfydepends-dummy.
-(Reading database ... 9677 files and directories currently installed.)
+(Reading database ... 9700 files and directories currently installed.)
 Unpacking pbuilder-satisfydepends-dummy (from .../pbuilder-satisfydepends-dummy.deb) ...
 dpkg: dependency problems prevent configuration of pbuilder-satisfydepends-dummy:
  pbuilder-satisfydepends-dummy depends on debhelper (>> 3.0.0); however:
@@ -52,14 +52,14 @@ The following NEW packages will be installed:
 The following partially installed packages will be configured:
   pbuilder-satisfydepends-dummy 
 0 packages upgraded, 21 newly installed, 0 to remove and 0 not upgraded.
-Need to get 10.9MB of archives. After unpacking 32.5MB will be used.
+Need to get 11.2MB of archives. After unpacking 33.1MB will be used.
 Writing extended state information...
 Get:1 http://localhost squeeze/main libmagic1 4.26-2 [369kB]
 Get:2 http://localhost squeeze/main file 4.26-2 [44.8kB]
-Get:3 http://localhost squeeze/main html2text 1.3.2a-5 [95.9kB]
+Get:3 http://localhost squeeze/main html2text 1.3.2a-13 [103kB]
 Get:4 http://localhost squeeze/main libpcre3 7.8-2 [215kB]
-Get:5 http://localhost squeeze/main libglib2.0-0 2.16.6-1 [826kB]
-Get:6 http://localhost squeeze/main libxml2 2.6.32.dfsg-5 [860kB]
+Get:5 http://localhost squeeze/main libglib2.0-0 2.18.4-2 [844kB]
+Get:6 http://localhost squeeze/main libxml2 2.7.3.dfsg-1 [870kB]
 Get:7 http://localhost squeeze/main libcroco3 0.6.1-2 [123kB]
 Get:8 http://localhost squeeze/main gettext-base 0.17-6 [125kB]
 Get:9 http://localhost squeeze/main gettext 0.17-6 [2710kB]
@@ -67,7 +67,7 @@ Get:10 http://localhost squeeze/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:11 http://localhost squeeze/main po-debconf 1.0.15 [237kB]
 Get:12 http://localhost squeeze/main groff-base 1.18.1.1-21 [898kB]
 Get:13 http://localhost squeeze/main bsdmainutils 6.1.10 [179kB]
-Get:14 http://localhost squeeze/main man-db 2.5.2-4 [1107kB]
+Get:14 http://localhost squeeze/main man-db 2.5.4-1 [1386kB]
 Get:15 http://localhost squeeze/main debhelper 7.0.17 [554kB]
 Get:16 http://localhost squeeze/main libdshconfig1 0.20.13-1 [11.0kB]
 Get:17 http://localhost squeeze/main libdshconfig1-dev 0.20.13-1 [25.4kB]
@@ -78,18 +78,18 @@ Get:21 http://localhost squeeze/main po4a 0.34-2 [847kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 9677 files and directories currently installed.)
+(Reading database ... 9700 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.26-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.26-2_amd64.deb) ...
 Selecting previously deselected package html2text.
-Unpacking html2text (from .../html2text_1.3.2a-5_amd64.deb) ...
+Unpacking html2text (from .../html2text_1.3.2a-13_amd64.deb) ...
 Selecting previously deselected package libpcre3.
 Unpacking libpcre3 (from .../libpcre3_7.8-2_amd64.deb) ...
 Selecting previously deselected package libglib2.0-0.
-Unpacking libglib2.0-0 (from .../libglib2.0-0_2.16.6-1_amd64.deb) ...
+Unpacking libglib2.0-0 (from .../libglib2.0-0_2.18.4-2_amd64.deb) ...
 Selecting previously deselected package libxml2.
-Unpacking libxml2 (from .../libxml2_2.6.32.dfsg-5_amd64.deb) ...
+Unpacking libxml2 (from .../libxml2_2.7.3.dfsg-1_amd64.deb) ...
 Selecting previously deselected package libcroco3.
 Unpacking libcroco3 (from .../libcroco3_0.6.1-2_amd64.deb) ...
 Selecting previously deselected package gettext-base.
@@ -105,7 +105,7 @@ Unpacking groff-base (from .../groff-base_1.18.1.1-21_amd64.deb) ...
 Selecting previously deselected package bsdmainutils.
 Unpacking bsdmainutils (from .../bsdmainutils_6.1.10_amd64.deb) ...
 Selecting previously deselected package man-db.
-Unpacking man-db (from .../man-db_2.5.2-4_amd64.deb) ...
+Unpacking man-db (from .../man-db_2.5.4-1_amd64.deb) ...
 Selecting previously deselected package debhelper.
 Unpacking debhelper (from .../debhelper_7.0.17_all.deb) ...
 Selecting previously deselected package libdshconfig1.
@@ -122,10 +122,10 @@ Selecting previously deselected package po4a.
 Unpacking po4a (from .../archives/po4a_0.34-2_all.deb) ...
 Setting up libmagic1 (4.26-2) ...
 Setting up file (4.26-2) ...
-Setting up html2text (1.3.2a-5) ...
+Setting up html2text (1.3.2a-13) ...
 Setting up libpcre3 (7.8-2) ...
-Setting up libglib2.0-0 (2.16.6-1) ...
-Setting up libxml2 (2.6.32.dfsg-5) ...
+Setting up libglib2.0-0 (2.18.4-2) ...
+Setting up libxml2 (2.7.3.dfsg-1) ...
 Setting up libcroco3 (0.6.1-2) ...
 Setting up gettext-base (0.17-6) ...
 Setting up gettext (0.17-6) ...
@@ -133,7 +133,7 @@ Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.15) ...
 Setting up groff-base (1.18.1.1-21) ...
 Setting up bsdmainutils (6.1.10) ...
-Setting up man-db (2.5.2-4) ...
+Setting up man-db (2.5.4-1) ...
 Building database of manual pages ...
 Setting up debhelper (7.0.17) ...
 Setting up libdshconfig1 (0.20.13-1) ...
@@ -156,16 +156,16 @@ Reading state information...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 116kB of archives.
+Need to get 117kB of archives.
 After this operation, 467kB of additional disk space will be used.
-Get:1 http://localhost squeeze/main fakeroot 1.11 [116kB]
+Get:1 http://localhost squeeze/main fakeroot 1.12.2 [117kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11221 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.11_amd64.deb) ...
+(Reading database ... 11246 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.12.2_amd64.deb) ...
 Processing triggers for man-db ...
-Setting up fakeroot (1.11) ...
+Setting up fakeroot (1.12.2) ...
 I: Copying source file
 I: copying [/TESTDIR/dir1/dsh_0.25.10-1.dsc]
 I: copying [/TESTDIR/dir1/dsh_0.25.10.orig.tar.gz]
@@ -300,7 +300,7 @@ checking for lf95... no
 checking for ftn... no
 checking whether we are using the GNU Fortran 77 compiler... no
 checking whether  accepts -g... no
-checking the maximum length of command line arguments... 98304
+checking the maximum length of command line arguments... 3458764513820540925
 checking command to parse /usr/bin/nm -B output from gcc object... ok
 checking for objdir... .libs
 checking for ar... ar
@@ -445,8 +445,8 @@ PASS: tests/param-f-fail.sh
 PASS: tests/param-f-with-space.sh
 PASS: tests/param-m.sh
 test to check that unknown parameter checking is right.
-./dsh: unrecognized option `--unknown-parameter'
-./dsh: invalid option -- u
+./dsh: unrecognized option '--unknown-parameter'
+./dsh: invalid option -- 'u'
 PASS: tests/param-unknown.sh
 test1
 test2
@@ -475,8 +475,8 @@ 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
+b: 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
@@ -489,7 +489,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
-Thu Feb 26 04:56:55 UTC 2009
+Sat Mar 21 02:50:39 UTC 2009
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -559,14 +559,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
-Thu Feb 26 04:57:00 UTC 2009
+Sat Mar 21 02:50:44 UTC 2009
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-c: c
 dsh: Process terminated (before write).
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -661,5 +661,5 @@ I: unmounting dev/pts filesystem
 I: unmounting proc filesystem
 I: cleaning the build env 
 I: removing directory /TESTDIR/dir1/NUM and its subdirectories
-I: Current time: Thu Feb 26 13:57:04 JST 2009
-I: pbuilder-time-stamp: 1235624224
+I: Current time: Sat Mar 21 11:51:09 JST 2009
+I: pbuilder-time-stamp: 1237603869
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index 8019f47..48a7bb1 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -8,6 +8,7 @@ I: Retrieving Packages
 I: Validating Packages
 I: Resolving dependencies of required packages...
 I: Resolving dependencies of base packages...
+I: Found additional required dependencies: libdb4.7 
 I: Found additional base dependencies: bzip2 cpp-4.3 debian-archive-keyring g++-4.3 gcc-4.3 gnupg gpgv libbz2-1.0 libgdbm3 libgmp3c2 libgomp1 libmpfr1ldbl libreadline5 libstdc++6-4.3-dev libtimedate-perl libusb-0.1-4 linux-libc-dev readline-common 
 I: Checking component main on http://localhost:9999/debian...
 I: Retrieving apt
@@ -22,6 +23,8 @@ I: Retrieving binutils
 I: Validating binutils
 I: Retrieving bsdutils
 I: Validating bsdutils
+I: Retrieving build-essential
+I: Validating build-essential
 I: Retrieving bzip2
 I: Validating bzip2
 I: Retrieving coreutils
@@ -92,6 +95,8 @@ I: Retrieving libcomerr2
 I: Validating libcomerr2
 I: Retrieving libdb4.6
 I: Validating libdb4.6
+I: Retrieving libdb4.7
+I: Validating libdb4.7
 I: Retrieving libdevmapper1.02.1
 I: Validating libdevmapper1.02.1
 I: Retrieving libgcc1
@@ -217,6 +222,7 @@ I: Extracting libblkid1...
 I: Extracting libc6...
 I: Extracting libcomerr2...
 I: Extracting libdb4.6...
+I: Extracting libdb4.7...
 I: Extracting libdevmapper1.02.1...
 I: Extracting libgcc1...
 I: Extracting liblocale-gettext-perl...
@@ -280,6 +286,7 @@ I: Unpacking libblkid1...
 I: Unpacking libc6...
 I: Unpacking libcomerr2...
 I: Unpacking libdb4.6...
+I: Unpacking libdb4.7...
 I: Unpacking libdevmapper1.02.1...
 I: Unpacking libgcc1...
 I: Unpacking liblocale-gettext-perl...
@@ -319,7 +326,6 @@ I: Unpacking zlib1g...
 I: Configuring required packages...
 I: Configuring sysv-rc...
 I: Configuring gcc-4.2-base...
-I: Configuring libpam-runtime...
 I: Configuring gcc-4.3-base...
 I: Configuring libc6...
 I: Configuring mktemp...
@@ -336,6 +342,7 @@ I: Configuring base-passwd...
 I: Configuring libcomerr2...
 I: Configuring mawk...
 I: Configuring libdb4.6...
+I: Configuring libdb4.7...
 I: Configuring grep...
 I: Configuring hostname...
 I: Configuring libacl1...
@@ -366,9 +373,10 @@ I: Configuring libtext-charwidth-perl...
 I: Configuring libtext-wrapi18n-perl...
 I: Configuring debconf-i18n...
 I: Configuring debconf...
+I: Configuring tzdata...
+I: Configuring libpam-runtime...
 I: Configuring libpam0g...
 I: Configuring libpam-modules...
-I: Configuring tzdata...
 I: Configuring passwd...
 I: Configuring login...
 I: Configuring libuuid1...
@@ -381,6 +389,7 @@ I: Configuring sysvinit...
 I: Unpacking the base system...
 I: Unpacking apt...
 I: Unpacking binutils...
+I: Unpacking build-essential...
 I: Unpacking bzip2...
 I: Unpacking cpio...
 I: Unpacking cpp...
@@ -434,12 +443,13 @@ I: Configuring gnupg...
 I: Configuring debian-archive-keyring...
 I: Configuring apt...
 I: Configuring perl-modules...
+I: Configuring libstdc++6-4.3-dev...
 I: Configuring perl...
 I: Configuring g++-4.3...
 I: Configuring libtimedate-perl...
-I: Configuring libstdc++6-4.3-dev...
 I: Configuring g++...
 I: Configuring dpkg-dev...
+I: Configuring build-essential...
 I: Base system installed successfully.
 I: debootstrap finished
 I: copying local configuration
@@ -460,7 +470,7 @@ I: upgrading packages
 I: mounting /proc filesystem
 I: mounting /dev/pts filesystem
 I: installing dummy policy-rc.d
-Get:1 http://localhost sid Release.gpg [189B]
+Get:1 http://localhost sid Release.gpg [197B]
 Hit http://localhost sid Release
 Ign http://localhost sid/main Packages/DiffIndex
 Ign http://localhost sid/main Packages
@@ -472,6 +482,7 @@ Building dependency tree...
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Reading package lists...
 Building dependency tree...
+build-essential is already the newest version.
 dpkg-dev is already the newest version.
 apt is already the newest version.
 The following extra packages will be installed:
@@ -481,23 +492,21 @@ Suggested packages:
 Recommended packages:
   aptitude-doc-en aptitude-doc libparse-debianchangelog-perl libgpm2
 The following NEW packages will be installed:
-  aptitude build-essential libcwidget3 libept0 libncursesw5 libsigc++-2.0-0c2a
-  libxapian15
-0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded.
-Need to get 4811kB of archives.
-After this operation, 14.2MB of additional disk space will be used.
-Get:1 http://localhost sid/main libncursesw5 5.7+20090214-1 [376kB]
+  aptitude libcwidget3 libept0 libncursesw5 libsigc++-2.0-0c2a libxapian15
+0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded.
+Need to get 4804kB of archives.
+After this operation, 14.1MB of additional disk space will be used.
+Get:1 http://localhost sid/main libncursesw5 5.7+20090314-1 [377kB]
 Get:2 http://localhost sid/main libsigc++-2.0-0c2a 2.0.18-2 [34.2kB]
 Get:3 http://localhost sid/main libcwidget3 0.5.12-4 [310kB]
 Get:4 http://localhost sid/main libxapian15 1.0.10-2 [810kB]
 Get:5 http://localhost sid/main libept0 0.5.26 [205kB]
 Get:6 http://localhost sid/main aptitude 0.4.11.11-1 [3068kB]
-Get:7 http://localhost sid/main build-essential 11.4 [7126B]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libncursesw5.
-(Reading database ... 9570 files and directories currently installed.)
-Unpacking libncursesw5 (from .../libncursesw5_5.7+20090214-1_amd64.deb) ...
+(Reading database ... 9592 files and directories currently installed.)
+Unpacking libncursesw5 (from .../libncursesw5_5.7+20090314-1_amd64.deb) ...
 Selecting previously deselected package libsigc++-2.0-0c2a.
 Unpacking libsigc++-2.0-0c2a (from .../libsigc++-2.0-0c2a_2.0.18-2_amd64.deb) ...
 Selecting previously deselected package libcwidget3.
@@ -508,15 +517,12 @@ Selecting previously deselected package libept0.
 Unpacking libept0 (from .../libept0_0.5.26_amd64.deb) ...
 Selecting previously deselected package aptitude.
 Unpacking aptitude (from .../aptitude_0.4.11.11-1_amd64.deb) ...
-Selecting previously deselected package build-essential.
-Unpacking build-essential (from .../build-essential_11.4_amd64.deb) ...
-Setting up libncursesw5 (5.7+20090214-1) ...
+Setting up libncursesw5 (5.7+20090314-1) ...
 Setting up libsigc++-2.0-0c2a (2.0.18-2) ...
 Setting up libcwidget3 (0.5.12-4) ...
 Setting up libxapian15 (1.0.10-2) ...
 Setting up libept0 (0.5.26) ...
 Setting up aptitude (0.4.11.11-1) ...
-Setting up build-essential (11.4) ...
 I: user script /var/cache/pbuilder/build//NUM/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh starting
 umount: /sys: not mounted
 umount: /run: not found
diff --git a/testsuite/normal/pbuilder-create-squeeze.log b/testsuite/normal/pbuilder-create-squeeze.log
index ed62d10..0a664be 100644
--- a/testsuite/normal/pbuilder-create-squeeze.log
+++ b/testsuite/normal/pbuilder-create-squeeze.log
@@ -8,6 +8,7 @@ I: Retrieving Packages
 I: Validating Packages
 I: Resolving dependencies of required packages...
 I: Resolving dependencies of base packages...
+I: Found additional required dependencies: libdb4.7 
 I: Found additional base dependencies: bzip2 cpp-4.3 debian-archive-keyring g++-4.3 gcc-4.3 gnupg gpgv libbz2-1.0 libgdbm3 libgmp3c2 libgomp1 libmpfr1ldbl libreadline5 libstdc++6-4.3-dev libtimedate-perl libusb-0.1-4 linux-libc-dev readline-common 
 I: Checking component main on http://localhost:9999/debian...
 I: Retrieving apt
@@ -92,6 +93,8 @@ I: Retrieving libcomerr2
 I: Validating libcomerr2
 I: Retrieving libdb4.6
 I: Validating libdb4.6
+I: Retrieving libdb4.7
+I: Validating libdb4.7
 I: Retrieving libdevmapper1.02.1
 I: Validating libdevmapper1.02.1
 I: Retrieving libgcc1
@@ -217,6 +220,7 @@ I: Extracting libblkid1...
 I: Extracting libc6...
 I: Extracting libcomerr2...
 I: Extracting libdb4.6...
+I: Extracting libdb4.7...
 I: Extracting libdevmapper1.02.1...
 I: Extracting libgcc1...
 I: Extracting liblocale-gettext-perl...
@@ -280,6 +284,7 @@ I: Unpacking libblkid1...
 I: Unpacking libc6...
 I: Unpacking libcomerr2...
 I: Unpacking libdb4.6...
+I: Unpacking libdb4.7...
 I: Unpacking libdevmapper1.02.1...
 I: Unpacking libgcc1...
 I: Unpacking liblocale-gettext-perl...
@@ -319,7 +324,6 @@ I: Unpacking zlib1g...
 I: Configuring required packages...
 I: Configuring sysv-rc...
 I: Configuring gcc-4.2-base...
-I: Configuring libpam-runtime...
 I: Configuring gcc-4.3-base...
 I: Configuring libc6...
 I: Configuring mktemp...
@@ -336,6 +340,7 @@ I: Configuring base-passwd...
 I: Configuring libcomerr2...
 I: Configuring mawk...
 I: Configuring libdb4.6...
+I: Configuring libdb4.7...
 I: Configuring grep...
 I: Configuring hostname...
 I: Configuring libacl1...
@@ -366,9 +371,10 @@ I: Configuring libtext-charwidth-perl...
 I: Configuring libtext-wrapi18n-perl...
 I: Configuring debconf-i18n...
 I: Configuring debconf...
+I: Configuring tzdata...
+I: Configuring libpam-runtime...
 I: Configuring libpam0g...
 I: Configuring libpam-modules...
-I: Configuring tzdata...
 I: Configuring passwd...
 I: Configuring login...
 I: Configuring libuuid1...
@@ -410,7 +416,6 @@ I: Unpacking perl...
 I: Unpacking perl-modules...
 I: Unpacking readline-common...
 I: Configuring the base system...
-I: Configuring gpgv...
 I: Configuring libgmp3c2...
 I: Configuring libgdbm3...
 I: Configuring libusb-0.1-4...
@@ -428,10 +433,11 @@ I: Configuring libc6-dev...
 I: Configuring bzip2...
 I: Configuring gcc-4.3...
 I: Configuring libreadline5...
-I: Configuring gnupg...
 I: Configuring cpp...
-I: Configuring debian-archive-keyring...
 I: Configuring gcc...
+I: Configuring gpgv...
+I: Configuring gnupg...
+I: Configuring debian-archive-keyring...
 I: Configuring apt...
 I: Configuring perl-modules...
 I: Configuring perl...
@@ -460,7 +466,7 @@ I: upgrading packages
 I: mounting /proc filesystem
 I: mounting /dev/pts filesystem
 I: installing dummy policy-rc.d
-Get:1 http://localhost squeeze Release.gpg [189B]
+Get:1 http://localhost squeeze Release.gpg [197B]
 Hit http://localhost squeeze Release
 Ign http://localhost squeeze/main Packages/DiffIndex
 Ign http://localhost squeeze/main Packages
@@ -484,36 +490,36 @@ The following NEW packages will be installed:
   aptitude build-essential libcwidget3 libept0 libncursesw5 libsigc++-2.0-0c2a
   libxapian15
 0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded.
-Need to get 4801kB of archives.
+Need to get 4811kB of archives.
 After this operation, 14.2MB of additional disk space will be used.
-Get:1 http://localhost squeeze/main libncursesw5 5.7+20081213-1 [375kB]
+Get:1 http://localhost squeeze/main libncursesw5 5.7+20090228-1 [376kB]
 Get:2 http://localhost squeeze/main libsigc++-2.0-0c2a 2.0.18-2 [34.2kB]
 Get:3 http://localhost squeeze/main libcwidget3 0.5.12-4 [310kB]
-Get:4 http://localhost squeeze/main libxapian15 1.0.7-4 [801kB]
+Get:4 http://localhost squeeze/main libxapian15 1.0.10-2 [810kB]
 Get:5 http://localhost squeeze/main libept0 0.5.26 [205kB]
 Get:6 http://localhost squeeze/main aptitude 0.4.11.11-1 [3068kB]
 Get:7 http://localhost squeeze/main build-essential 11.4 [7126B]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libncursesw5.
-(Reading database ... 9480 files and directories currently installed.)
-Unpacking libncursesw5 (from .../libncursesw5_5.7+20081213-1_amd64.deb) ...
+(Reading database ... 9503 files and directories currently installed.)
+Unpacking libncursesw5 (from .../libncursesw5_5.7+20090228-1_amd64.deb) ...
 Selecting previously deselected package libsigc++-2.0-0c2a.
 Unpacking libsigc++-2.0-0c2a (from .../libsigc++-2.0-0c2a_2.0.18-2_amd64.deb) ...
 Selecting previously deselected package libcwidget3.
 Unpacking libcwidget3 (from .../libcwidget3_0.5.12-4_amd64.deb) ...
 Selecting previously deselected package libxapian15.
-Unpacking libxapian15 (from .../libxapian15_1.0.7-4_amd64.deb) ...
+Unpacking libxapian15 (from .../libxapian15_1.0.10-2_amd64.deb) ...
 Selecting previously deselected package libept0.
 Unpacking libept0 (from .../libept0_0.5.26_amd64.deb) ...
 Selecting previously deselected package aptitude.
 Unpacking aptitude (from .../aptitude_0.4.11.11-1_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.4_amd64.deb) ...
-Setting up libncursesw5 (5.7+20081213-1) ...
+Setting up libncursesw5 (5.7+20090228-1) ...
 Setting up libsigc++-2.0-0c2a (2.0.18-2) ...
 Setting up libcwidget3 (0.5.12-4) ...
-Setting up libxapian15 (1.0.7-4) ...
+Setting up libxapian15 (1.0.10-2) ...
 Setting up libept0 (0.5.26) ...
 Setting up aptitude (0.4.11.11-1) ...
 Setting up build-essential (11.4) ...
diff --git a/testsuite/normal/pbuilder-update-lenny-squeeze-sid-experimental.log b/testsuite/normal/pbuilder-update-lenny-squeeze-sid-experimental.log
index ea7a264..7ab2107 100644
--- a/testsuite/normal/pbuilder-update-lenny-squeeze-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-lenny-squeeze-sid-experimental.log
@@ -11,13 +11,13 @@ I: policy-rc.d already exists
 I: Refreshing the base.tgz 
 I: upgrading packages
 Hit http://localhost sid Release.gpg
-Get:1 http://localhost experimental Release.gpg [189B]
+Get:1 http://localhost experimental Release.gpg [197B]
 Hit http://localhost sid Release
-Get:2 http://localhost experimental Release [74.0kB]
+Get:2 http://localhost experimental Release [76.6kB]
 Ign http://localhost sid/main Packages/DiffIndex
 Ign http://localhost experimental/main Packages
 Ign http://localhost sid/main Packages
-Get:3 http://localhost experimental/main Packages [766kB]
+Get:3 http://localhost experimental/main Packages [573kB]
 Hit http://localhost sid/main Packages
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
@@ -25,61 +25,79 @@ Reading package lists...
 Building dependency tree...
 Reading state information...
 The following NEW packages will be installed:
-  libdb4.5 libsqlite3-0 libssl0.9.8 lsb-release mime-support python
+  libdb4.5 libicu40 libsqlite3-0 libssl0.9.8 lsb-release mime-support python
   python-central python-debian python-minimal python-support python-xapian
   python2.5 python2.5-minimal
 The following packages have been kept back:
   apt aptitude
 The following packages will be upgraded:
-  bsdutils diff libsigc++-2.0-0c2a mount util-linux
-5 upgraded, 13 newly installed, 0 to remove and 2 not upgraded.
-Need to get 8083kB of archives.
-After this operation, 24.3MB of additional disk space will be used.
-Get:1 http://localhost experimental/main diff 2.8.7-0.2 [248kB]
-Get:2 http://localhost experimental/main mount 2.14~rc2-0 [145kB]
-Get:3 http://localhost experimental/main util-linux 2.14~rc2-0 [550kB]
-Get:4 http://localhost experimental/main bsdutils 1:2.14~rc2-0 [64.7kB]
-Get:5 http://localhost experimental/main libsigc++-2.0-0c2a 2.2.2-1 [35.3kB]
-Get:6 http://localhost sid/main libssl0.9.8 0.9.8g-15 [975kB]
-Get:7 http://localhost sid/main libdb4.5 4.5.20-13 [555kB]
-Get:8 http://localhost experimental/main libsqlite3-0 3.6.10-1 [287kB]
-Get:9 http://localhost sid/main mime-support 3.44-1 [33.3kB]
-Get:10 http://localhost sid/main python2.5-minimal 2.5.4-1 [1290kB]
-Get:11 http://localhost sid/main python2.5 2.5.4-1 [3041kB]
-Get:12 http://localhost sid/main python-minimal 2.5.4-1 [13.9kB]
-Get:13 http://localhost sid/main python 2.5.4-1 [142kB]
-Get:14 http://localhost sid/main python-central 0.6.11 [44.8kB]
-Get:15 http://localhost experimental/main python-support 0.90.2 [30.0kB]
-Get:16 http://localhost sid/main python-debian 0.1.12 [53.1kB]
-Get:17 http://localhost sid/main python-xapian 1.0.10-1 [555kB]
-Get:18 http://localhost sid/main lsb-release 3.2-20 [20.0kB]
+  bash binutils bsdutils diff dpkg dpkg-dev libgmp3c2 libsigc++-2.0-0c2a mount
+  util-linux
+10 upgraded, 14 newly installed, 0 to remove and 2 not upgraded.
+Need to get 22.5MB of archives.
+After this operation, 43.5MB of additional disk space will be used.
+Get:1 http://localhost experimental/main bash 4.0-1 [1158kB]
+Get:2 http://localhost experimental/main diff 2.8.7-0.2 [248kB]
+Get:3 http://localhost experimental/main dpkg 1.15.0 [2193kB]
+Get:4 http://localhost experimental/main mount 2.14~rc2-0 [145kB]
+Get:5 http://localhost experimental/main util-linux 2.14~rc2-0 [550kB]
+Get:6 http://localhost experimental/main bsdutils 1:2.14~rc2-0 [64.7kB]
+Get:7 http://localhost experimental/main libsigc++-2.0-0c2a 2.2.2-1 [35.3kB]
+Get:8 http://localhost sid/main libssl0.9.8 0.9.8g-15 [975kB]
+Get:9 http://localhost sid/main libdb4.5 4.5.20-13 [555kB]
+Get:10 http://localhost sid/main libicu40 4.0.1-2 [6944kB]
+Get:11 http://localhost sid/main libsqlite3-0 3.6.11-1 [293kB]
+Get:12 http://localhost sid/main mime-support 3.44-1 [33.3kB]
+Get:13 http://localhost sid/main python2.5-minimal 2.5.4-1 [1290kB]
+Get:14 http://localhost sid/main python2.5 2.5.4-1 [3041kB]
+Get:15 http://localhost experimental/main python-minimal 2.5.4-3 [13.9kB]
+Get:16 http://localhost experimental/main python 2.5.4-3 [142kB]
+Get:17 http://localhost sid/main python-central 0.6.11 [44.8kB]
+Get:18 http://localhost experimental/main binutils 2.19.51.20090315-1 [3150kB]
+Get:19 http://localhost experimental/main dpkg-dev 1.15.0 [760kB]
+Get:20 http://localhost experimental/main libgmp3c2 2:4.2.4+dfsg-4 [207kB]
+Get:21 http://localhost experimental/main python-support 0.90.3 [30.8kB]
+Get:22 http://localhost sid/main python-debian 0.1.12 [53.1kB]
+Get:23 http://localhost sid/main python-xapian 1.0.10-1 [555kB]
+Get:24 http://localhost sid/main lsb-release 3.2-22 [21.1kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
-(Reading database ... 9767 files and directories currently installed.)
+(Reading database ... 9780 files and directories currently installed.)
+Preparing to replace bash 3.2-5 (using .../archives/bash_4.0-1_amd64.deb) ...
+Unpacking replacement bash ...
+Setting up bash (4.0-1) ...
+(Reading database ... 9801 files and directories currently installed.)
 Preparing to replace diff 2.8.1-12 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
-(Reading database ... 9775 files and directories currently installed.)
+(Reading database ... 9809 files and directories currently installed.)
+Preparing to replace dpkg 1.14.25 (using .../archives/dpkg_1.15.0_amd64.deb) ...
+Unpacking replacement dpkg ...
+Setting up dpkg (1.15.0) ...
+Installing new version of config file /etc/logrotate.d/dpkg ...
+(Reading database ... 
+(Reading database ...   5%
+(Reading database ...  10%
+(Reading database ...  15%
+(Reading database ...  20%
+(Reading database ...  25%
+(Reading database ...  30%
+(Reading database ...  35%
+(Reading database ...  40%
+(Reading database ...  45%
+(Reading database ...  50%
+(Reading database ...  55%
+(Reading database ...  60%
+(Reading database ...  65%
+(Reading database ...  70%
+(Reading database ...  75%
+(Reading database ...  80%
+(Reading database ...  85%
+(Reading database ...  90%
+(Reading database ...  95%
+(Reading database ... 100%
+(Reading database ... 9801 files and directories currently installed.)
 Preparing to replace mount 2.13.1.1-1 (using .../mount_2.14~rc2-0_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.14~rc2-0) ...
-(Reading database ... 9775 files and directories currently installed.)
+(Reading database ... 
+(Reading database ...   5%
+(Reading database ...  10%
+(Reading database ...  15%
+(Reading database ...  20%
+(Reading database ...  25%
+(Reading database ...  30%
+(Reading database ...  35%
+(Reading database ...  40%
+(Reading database ...  45%
+(Reading database ...  50%
+(Reading database ...  55%
+(Reading database ...  60%
+(Reading database ...  65%
+(Reading database ...  70%
+(Reading database ...  75%
+(Reading database ...  80%
+(Reading database ...  85%
+(Reading database ...  90%
+(Reading database ...  95%
+(Reading database ... 100%
+(Reading database ... 9801 files and directories currently installed.)
 Preparing to replace util-linux 2.13.1.1-1 (using .../util-linux_2.14~rc2-0_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.14~rc2-0) ...
-(Reading database ... 9777 files and directories currently installed.)
+(Reading database ... 
+(Reading database ...   5%
+(Reading database ...  10%
+(Reading database ...  15%
+(Reading database ...  20%
+(Reading database ...  25%
+(Reading database ...  30%
+(Reading database ...  35%
+(Reading database ...  40%
+(Reading database ...  45%
+(Reading database ...  50%
+(Reading database ...  55%
+(Reading database ...  60%
+(Reading database ...  65%
+(Reading database ...  70%
+(Reading database ...  75%
+(Reading database ...  80%
+(Reading database ...  85%
+(Reading database ...  90%
+(Reading database ...  95%
+(Reading database ... 100%
+(Reading database ... 9803 files and directories currently installed.)
 Preparing to replace bsdutils 1:2.13.1.1-1 (using .../bsdutils_1%3a2.14~rc2-0_amd64.deb) ...
 Unpacking replacement bsdutils ...
 Setting up bsdutils (1:2.14~rc2-0) ...
-(Reading database ... 9777 files and directories currently installed.)
+(Reading database ... 
+(Reading database ...   5%
+(Reading database ...  10%
+(Reading database ...  15%
+(Reading database ...  20%
+(Reading database ...  25%
+(Reading database ...  30%
+(Reading database ...  35%
+(Reading database ...  40%
+(Reading database ...  45%
+(Reading database ...  50%
+(Reading database ...  55%
+(Reading database ...  60%
+(Reading database ...  65%
+(Reading database ...  70%
+(Reading database ...  75%
+(Reading database ...  80%
+(Reading database ...  85%
+(Reading database ...  90%
+(Reading database ...  95%
+(Reading database ... 100%
+(Reading database ... 9803 files and directories currently installed.)
 Preparing to replace libsigc++-2.0-0c2a 2.0.18-2 (using .../libsigc++-2.0-0c2a_2.2.2-1_amd64.deb) ...
 Unpacking replacement libsigc++-2.0-0c2a ...
 Selecting previously deselected package libssl0.9.8.
 Unpacking libssl0.9.8 (from .../libssl0.9.8_0.9.8g-15_amd64.deb) ...
 Selecting previously deselected package libdb4.5.
 Unpacking libdb4.5 (from .../libdb4.5_4.5.20-13_amd64.deb) ...
+Selecting previously deselected package libicu40.
+Unpacking libicu40 (from .../libicu40_4.0.1-2_amd64.deb) ...
 Selecting previously deselected package libsqlite3-0.
-Unpacking libsqlite3-0 (from .../libsqlite3-0_3.6.10-1_amd64.deb) ...
+Unpacking libsqlite3-0 (from .../libsqlite3-0_3.6.11-1_amd64.deb) ...
 Selecting previously deselected package mime-support.
 Unpacking mime-support (from .../mime-support_3.44-1_all.deb) ...
 Selecting previously deselected package python2.5-minimal.
@@ -87,33 +105,44 @@ Unpacking python2.5-minimal (from .../python2.5-minimal_2.5.4-1_amd64.deb) ...
 Selecting previously deselected package python2.5.
 Unpacking python2.5 (from .../python2.5_2.5.4-1_amd64.deb) ...
 Selecting previously deselected package python-minimal.
-Unpacking python-minimal (from .../python-minimal_2.5.4-1_all.deb) ...
+Unpacking python-minimal (from .../python-minimal_2.5.4-3_all.deb) ...
 Selecting previously deselected package python.
-Unpacking python (from .../python_2.5.4-1_all.deb) ...
+Unpacking python (from .../python_2.5.4-3_all.deb) ...
 Selecting previously deselected package python-central.
 Unpacking python-central (from .../python-central_0.6.11_all.deb) ...
+Preparing to replace binutils 2.19.1-1 (using .../binutils_2.19.51.20090315-1_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace dpkg-dev 1.14.25 (using .../dpkg-dev_1.15.0_all.deb) ...
+Unpacking replacement dpkg-dev ...
+Preparing to replace libgmp3c2 2:4.2.4+dfsg-2 (using .../libgmp3c2_2%3a4.2.4+dfsg-4_amd64.deb) ...
+Unpacking replacement libgmp3c2 ...
 Selecting previously deselected package python-support.
-Unpacking python-support (from .../python-support_0.90.2_all.deb) ...
+Unpacking python-support (from .../python-support_0.90.3_all.deb) ...
 Selecting previously deselected package python-debian.
 Unpacking python-debian (from .../python-debian_0.1.12_all.deb) ...
 Selecting previously deselected package python-xapian.
 Unpacking python-xapian (from .../python-xapian_1.0.10-1_amd64.deb) ...
 Selecting previously deselected package lsb-release.
-Unpacking lsb-release (from .../lsb-release_3.2-20_all.deb) ...
+Unpacking lsb-release (from .../lsb-release_3.2-22_all.deb) ...
 Setting up libsigc++-2.0-0c2a (2.2.2-1) ...
 Setting up libssl0.9.8 (0.9.8g-15) ...
 Setting up libdb4.5 (4.5.20-13) ...
-Setting up libsqlite3-0 (3.6.10-1) ...
+Setting up libicu40 (4.0.1-2) ...
+Setting up libsqlite3-0 (3.6.11-1) ...
 Setting up mime-support (3.44-1) ...
+update-alternatives: using /usr/bin/see to provide /usr/bin/view (view) in auto mode.
 Setting up python2.5-minimal (2.5.4-1) ...
 Setting up python2.5 (2.5.4-1) ...
-Setting up python-minimal (2.5.4-1) ...
-Setting up python (2.5.4-1) ...
+Setting up python-minimal (2.5.4-3) ...
+Setting up python (2.5.4-3) ...
 Setting up python-central (0.6.11) ...
-Setting up python-support (0.90.2) ...
+Setting up binutils (2.19.51.20090315-1) ...
+Setting up dpkg-dev (1.15.0) ...
+Setting up libgmp3c2 (2:4.2.4+dfsg-4) ...
+Setting up python-support (0.90.3) ...
 Setting up python-debian (0.1.12) ...
 Setting up python-xapian (1.0.10-1) ...
-Setting up lsb-release (3.2-20) ...
+Setting up lsb-release (3.2-22) ...
 Processing triggers for python-support ...
 Reading package lists...
 Building dependency tree...
diff --git a/testsuite/normal/pbuilder-update-lenny-squeeze-sid.log b/testsuite/normal/pbuilder-update-lenny-squeeze-sid.log
index c73c57a..d0c567c 100644
--- a/testsuite/normal/pbuilder-update-lenny-squeeze-sid.log
+++ b/testsuite/normal/pbuilder-update-lenny-squeeze-sid.log
@@ -9,161 +9,140 @@ I: mounting /dev/pts filesystem
 I: policy-rc.d already exists
 I: Refreshing the base.tgz 
 I: upgrading packages
-Get:1 http://localhost sid Release.gpg [189B]
-Get:2 http://localhost sid Release [74.9kB]
+Get:1 http://localhost sid Release.gpg [197B]
+Get:2 http://localhost sid Release [77.8kB]
 Ign http://localhost sid/main Packages
-Get:3 http://localhost sid/main Packages [7393kB]
+Get:3 http://localhost sid/main Packages [7478kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 Reading package lists...
 Building dependency tree...
 Reading state information...
 The following packages will be upgraded:
-  coreutils cpio cpp cpp-4.3 debconf debconf-i18n g++ g++-4.3 gcc gcc-4.3
-  gcc-4.3-base gnupg gpgv libc6 libc6-dev libdevmapper1.02.1 libgcc1 libgmp3c2
-  libgomp1 libmpfr1ldbl libncurses5 libncursesw5 libselinux1 libstdc++6
-  libstdc++6-4.3-dev libxapian15 linux-libc-dev ncurses-base ncurses-bin
-29 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 31.3MB of archives.
-After this operation, 1946kB of additional disk space will be used.
+  base-passwd coreutils cpp-4.3 g++-4.3 gcc-4.3 gcc-4.3-base libc6 libc6-dev
+  libdevmapper1.02.1 libgcc1 libgomp1 libncurses5 libncursesw5 libselinux1
+  libstdc++6 libstdc++6-4.3-dev linux-libc-dev lsb-base ncurses-base
+  ncurses-bin tzdata zlib1g
+22 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 28.1MB of archives.
+After this operation, 1540kB of additional disk space will be used.
 Get:1 http://localhost sid/main coreutils 7.1-2 [4768kB]
-Get:2 http://localhost sid/main ncurses-bin 5.7+20090214-1 [310kB]
+Get:2 http://localhost sid/main ncurses-bin 5.7+20090314-1 [310kB]
 Get:3 http://localhost sid/main linux-libc-dev 2.6.28-1 [817kB]
-Get:4 http://localhost sid/main libc6-dev 2.9-3 [2519kB]
-Get:5 http://localhost sid/main libgomp1 4.3.3-4 [15.5kB]
-Get:6 http://localhost sid/main cpp-4.3 4.3.3-4 [3373kB]
-Get:7 http://localhost sid/main gcc-4.3-base 4.3.3-4 [106kB]
-Get:8 http://localhost sid/main libgcc1 1:4.3.3-4 [44.5kB]
-Get:9 http://localhost sid/main gcc-4.3 4.3.3-4 [2607kB]
-Get:10 http://localhost sid/main g++-4.3 4.3.3-4 [4817kB]
-Get:11 http://localhost sid/main libstdc++6-4.3-dev 4.3.3-4 [1415kB]
-Get:12 http://localhost sid/main libstdc++6 4.3.3-4 [334kB]
-Get:13 http://localhost sid/main libgmp3c2 2:4.2.4+dfsg-2 [215kB]
-Get:14 http://localhost sid/main libmpfr1ldbl 2.4.0-5 [417kB]
-Get:15 http://localhost sid/main libc6 2.9-3 [4919kB]
-Get:16 http://localhost sid/main libncurses5 5.7+20090214-1 [355kB]
-Get:17 http://localhost sid/main ncurses-base 5.7+20090214-1 [179kB]
-Get:18 http://localhost sid/main debconf-i18n 1.5.25 [177kB]
-Get:19 http://localhost sid/main debconf 1.5.25 [148kB]
-Get:20 http://localhost sid/main gpgv 1.4.9-4 [183kB]
-Get:21 http://localhost sid/main gnupg 1.4.9-4 [2047kB]
-Get:22 http://localhost sid/main libselinux1 2.0.71-1 [78.8kB]
-Get:23 http://localhost sid/main cpio 2.9.90-2 [184kB]
-Get:24 http://localhost sid/main libncursesw5 5.7+20090214-1 [376kB]
-Get:25 http://localhost sid/main libxapian15 1.0.10-2 [810kB]
-Get:26 http://localhost sid/main libdevmapper1.02.1 2:1.02.30-1 [61.7kB]
-Get:27 http://localhost sid/main cpp 4:4.3.2-3 [13.9kB]
-Get:28 http://localhost sid/main gcc 4:4.3.2-3 [5002B]
-Get:29 http://localhost sid/main g++ 4:4.3.2-3 [1372B]
+Get:4 http://localhost sid/main libc6-dev 2.9-6 [2522kB]
+Get:5 http://localhost sid/main libgomp1 4.3.3-5 [15.4kB]
+Get:6 http://localhost sid/main cpp-4.3 4.3.3-5 [3374kB]
+Get:7 http://localhost sid/main gcc-4.3-base 4.3.3-5 [106kB]
+Get:8 http://localhost sid/main libgcc1 1:4.3.3-5 [44.5kB]
+Get:9 http://localhost sid/main gcc-4.3 4.3.3-5 [2610kB]
+Get:10 http://localhost sid/main g++-4.3 4.3.3-5 [4821kB]
+Get:11 http://localhost sid/main libstdc++6-4.3-dev 4.3.3-5 [1423kB]
+Get:12 http://localhost sid/main libstdc++6 4.3.3-5 [334kB]
+Get:13 http://localhost sid/main libc6 2.9-6 [4936kB]
+Get:14 http://localhost sid/main base-passwd 3.5.21 [42.0kB]
+Get:15 http://localhost sid/main libncurses5 5.7+20090314-1 [355kB]
+Get:16 http://localhost sid/main ncurses-base 5.7+20090314-1 [179kB]
+Get:17 http://localhost sid/main libselinux1 2.0.71-1 [78.8kB]
+Get:18 http://localhost sid/main lsb-base 3.2-22 [19.8kB]
+Get:19 http://localhost sid/main tzdata 2009c-1 [782kB]
+Get:20 http://localhost sid/main zlib1g 1:1.2.3.3.dfsg-13 [76.0kB]
+Get:21 http://localhost sid/main libncursesw5 5.7+20090314-1 [377kB]
+Get:22 http://localhost sid/main libdevmapper1.02.1 2:1.02.30-3 [61.8kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
-(Reading database ... 9677 files and directories currently installed.)
-Preparing to replace coreutils 6.10-6 (using .../coreutils_7.1-2_amd64.deb) ...
-Unpacking replacement coreutils ...
-Setting up coreutils (7.1-2) ...
-(Reading database ... 9682 files and directories currently installed.)
-Preparing to replace ncurses-bin 5.7+20081213-1 (using .../ncurses-bin_5.7+20090214-1_amd64.deb) ...
-Unpacking replacement ncurses-bin ...
-Setting up ncurses-bin (5.7+20090214-1) ...
-(Reading database ... 9682 files and directories currently installed.)
-Preparing to replace linux-libc-dev 2.6.26-13 (using .../linux-libc-dev_2.6.28-1_amd64.deb) ...
-Unpacking replacement linux-libc-dev ...
-Preparing to replace libc6-dev 2.7-18 (using .../libc6-dev_2.9-3_amd64.deb) ...
-Unpacking replacement libc6-dev ...
-Preparing to replace libgomp1 4.3.3-3 (using .../libgomp1_4.3.3-4_amd64.deb) ...
-Unpacking replacement libgomp1 ...
-Preparing to replace cpp-4.3 4.3.3-3 (using .../cpp-4.3_4.3.3-4_amd64.deb) ...
-Unpacking replacement cpp-4.3 ...
-Preparing to replace gcc-4.3-base 4.3.3-3 (using .../gcc-4.3-base_4.3.3-4_amd64.deb) ...
-Unpacking replacement gcc-4.3-base ...
-Setting up gcc-4.3-base (4.3.3-4) ...
-(Reading database ... 9762 files and directories currently installed.)
-Preparing to replace libgcc1 1:4.3.3-3 (using .../libgcc1_1%3a4.3.3-4_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up libgcc1 (1:4.3.3-4) ...
-(Reading database ... 9762 files and directories currently installed.)
-Preparing to replace gcc-4.3 4.3.3-3 (using .../gcc-4.3_4.3.3-4_amd64.deb) ...
-Unpacking replacement gcc-4.3 ...
-Preparing to replace g++-4.3 4.3.3-3 (using .../g++-4.3_4.3.3-4_amd64.deb) ...
-Unpacking replacement g++-4.3 ...
-Preparing to replace libstdc++6-4.3-dev 4.3.3-3 (using .../libstdc++6-4.3-dev_4.3.3-4_amd64.deb) ...
-Unpacking replacement libstdc++6-4.3-dev ...
-Preparing to replace libstdc++6 4.3.3-3 (using .../libstdc++6_4.3.3-4_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.3.3-4) ...
-(Reading database ... 9760 files and directories currently installed.)
-Preparing to replace libgmp3c2 2:4.2.2+dfsg-3 (using .../libgmp3c2_2%3a4.2.4+dfsg-2_amd64.deb) ...
-Unpacking replacement libgmp3c2 ...
-Preparing to replace libmpfr1ldbl 2.3.2.dfsg.1-1 (using .../libmpfr1ldbl_2.4.0-5_amd64.deb) ...
-Unpacking replacement libmpfr1ldbl ...
-Preparing to replace libc6 2.7-18 (using .../archives/libc6_2.9-3_amd64.deb) ...
-Checking for services that may need to be restarted...
-Checking init scripts...
-Unpacking replacement libc6 ...
-Setting up libc6 (2.9-3) ...
-Installing new version of config file /etc/gai.conf ...
-Installing new version of config file /etc/init.d/glibc.sh ...
-(Reading database ... 9764 files and directories currently installed.)
-Preparing to replace libncurses5 5.7+20081213-1 (using .../libncurses5_5.7+20090214-1_amd64.deb) ...
-Unpacking replacement libncurses5 ...
-Setting up libncurses5 (5.7+20090214-1) ...
-(Reading database ... 9764 files and directories currently installed.)
-Preparing to replace ncurses-base 5.7+20081213-1 (using .../ncurses-base_5.7+20090214-1_all.deb) ...
-Unpacking replacement ncurses-base ...
-Setting up ncurses-base (5.7+20090214-1) ...
-(Reading database ... 9764 files and directories currently installed.)
-Preparing to replace debconf-i18n 1.5.24 (using .../debconf-i18n_1.5.25_all.deb) ...
-Unpacking replacement debconf-i18n ...
-Setting up debconf-i18n (1.5.25) ...
-(Reading database ... 9764 files and directories currently installed.)
-Preparing to replace debconf 1.5.24 (using .../debconf_1.5.25_all.deb) ...
-Unpacking replacement debconf ...
-Setting up debconf (1.5.25) ...
-(Reading database ... 9764 files and directories currently installed.)
-Preparing to replace gpgv 1.4.9-3 (using .../gpgv_1.4.9-4_amd64.deb) ...
-Unpacking replacement gpgv ...
-Setting up gpgv (1.4.9-4) ...
-(Reading database ... 9764 files and directories currently installed.)
-Preparing to replace gnupg 1.4.9-3 (using .../gnupg_1.4.9-4_amd64.deb) ...
-Unpacking replacement gnupg ...
-Setting up gnupg (1.4.9-4) ...
-(Reading database ... 9766 files and directories currently installed.)
-Preparing to replace libselinux1 2.0.65-5 (using .../libselinux1_2.0.71-1_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (2.0.71-1) ...
-init: timeout opening/writing control channel /dev/initctl
-(Reading database ... 9766 files and directories currently installed.)
-Preparing to replace cpio 2.9-15 (using .../cpio_2.9.90-2_amd64.deb) ...
-Unpacking replacement cpio ...
-Preparing to replace libncursesw5 5.7+20081213-1 (using .../libncursesw5_5.7+20090214-1_amd64.deb) ...
-Unpacking replacement libncursesw5 ...
-Preparing to replace libxapian15 1.0.7-4 (using .../libxapian15_1.0.10-2_amd64.deb) ...
-Unpacking replacement libxapian15 ...
-Preparing to replace libdevmapper1.02.1 2:1.02.27-4 (using .../libdevmapper1.02.1_2%3a1.02.30-1_amd64.deb) ...
-Unpacking replacement libdevmapper1.02.1 ...
-Preparing to replace cpp 4:4.3.2-2 (using .../cpp_4%3a4.3.2-3_amd64.deb) ...
-Unpacking replacement cpp ...
-Preparing to replace gcc 4:4.3.2-2 (using .../gcc_4%3a4.3.2-3_amd64.deb) ...
-Removing old gcc doc directory.
-Unpacking replacement gcc ...
-Preparing to replace g++ 4:4.3.2-2 (using .../g++_4%3a4.3.2-3_amd64.deb) ...
-Unpacking replacement g++ ...
-Setting up linux-libc-dev (2.6.28-1) ...
-Setting up libc6-dev (2.9-3) ...
-Setting up libgomp1 (4.3.3-4) ...
-Setting up libgmp3c2 (2:4.2.4+dfsg-2) ...
-Setting up libmpfr1ldbl (2.4.0-5) ...
-Setting up cpp-4.3 (4.3.3-4) ...
-Setting up gcc-4.3 (4.3.3-4) ...
-Setting up cpio (2.9.90-2) ...
-Setting up libncursesw5 (5.7+20090214-1) ...
-Setting up libxapian15 (1.0.10-2) ...
-Setting up libdevmapper1.02.1 (2:1.02.30-1) ...
-Setting up cpp (4:4.3.2-3) ...
-Setting up gcc (4:4.3.2-3) ...
-Setting up g++-4.3 (4.3.3-4) ...
-Setting up g++ (4:4.3.2-3) ...
-Setting up libstdc++6-4.3-dev (4.3.3-4) ...
+(READING DATABASE ... 9700 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE COREUTILS 6.10-6 (USING .../COREUTILS_7.1-2_AMD64.DEB) ...
+UNPACKING REPLACEMENT COREUTILS ...
+SETTING UP COREUTILS (7.1-2) ...
+(READING DATABASE ... 9705 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE NCURSES-BIN 5.7+20090228-1 (USING .../NCURSES-BIN_5.7+20090314-1_AMD64.DEB) ...
+UNPACKING REPLACEMENT NCURSES-BIN ...
+SETTING UP NCURSES-BIN (5.7+20090314-1) ...
+(READING DATABASE ... 9705 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE LINUX-LIBC-DEV 2.6.26-13 (USING .../LINUX-LIBC-DEV_2.6.28-1_AMD64.DEB) ...
+UNPACKING REPLACEMENT LINUX-LIBC-DEV ...
+PREPARING TO REPLACE LIBC6-DEV 2.9-4 (USING .../LIBC6-DEV_2.9-6_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBC6-DEV ...
+PREPARING TO REPLACE LIBGOMP1 4.3.3-3 (USING .../LIBGOMP1_4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBGOMP1 ...
+PREPARING TO REPLACE CPP-4.3 4.3.3-3 (USING .../CPP-4.3_4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT CPP-4.3 ...
+PREPARING TO REPLACE GCC-4.3-BASE 4.3.3-3 (USING .../GCC-4.3-BASE_4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT GCC-4.3-BASE ...
+SETTING UP GCC-4.3-BASE (4.3.3-5) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE LIBGCC1 1:4.3.3-3 (USING .../LIBGCC1_1%3A4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBGCC1 ...
+SETTING UP LIBGCC1 (1:4.3.3-5) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE GCC-4.3 4.3.3-3 (USING .../GCC-4.3_4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT GCC-4.3 ...
+PREPARING TO REPLACE G++-4.3 4.3.3-3 (USING .../G++-4.3_4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT G++-4.3 ...
+PREPARING TO REPLACE LIBSTDC++6-4.3-DEV 4.3.3-3 (USING .../LIBSTDC++6-4.3-DEV_4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBSTDC++6-4.3-DEV ...
+PREPARING TO REPLACE LIBSTDC++6 4.3.3-3 (USING .../LIBSTDC++6_4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBSTDC++6 ...
+SETTING UP LIBSTDC++6 (4.3.3-5) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE LIBC6 2.9-4 (USING .../ARCHIVES/LIBC6_2.9-6_AMD64.DEB) ...
+CHECKING FOR SERVICES THAT MAY NEED TO BE RESTARTED...
+CHECKING INIT SCRIPTS...
+UNPACKING REPLACEMENT LIBC6 ...
+SETTING UP LIBC6 (2.9-6) ...
+INSTALLING NEW VERSION OF CONFIG FILE /ETC/INIT.D/GLIBC.SH ...
+CHECKING FOR SERVICES THAT MAY NEED TO BE RESTARTED...
+CHECKING INIT SCRIPTS...
+NOTHING TO RESTART.
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE BASE-PASSWD 3.5.20 (USING .../BASE-PASSWD_3.5.21_AMD64.DEB) ...
+UNPACKING REPLACEMENT BASE-PASSWD ...
+SETTING UP BASE-PASSWD (3.5.21) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE LIBNCURSES5 5.7+20090228-1 (USING .../LIBNCURSES5_5.7+20090314-1_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBNCURSES5 ...
+SETTING UP LIBNCURSES5 (5.7+20090314-1) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE NCURSES-BASE 5.7+20090228-1 (USING .../NCURSES-BASE_5.7+20090314-1_ALL.DEB) ...
+UNPACKING REPLACEMENT NCURSES-BASE ...
+SETTING UP NCURSES-BASE (5.7+20090314-1) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE LIBSELINUX1 2.0.65-5 (USING .../LIBSELINUX1_2.0.71-1_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBSELINUX1 ...
+SETTING UP LIBSELINUX1 (2.0.71-1) ...
+INIT: TIMEOUT OPENING/WRITING CONTROL CHANNEL /DEV/INITCTL
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE LSB-BASE 3.2-20 (USING .../LSB-BASE_3.2-22_ALL.DEB) ...
+UNPACKING REPLACEMENT LSB-BASE ...
+SETTING UP LSB-BASE (3.2-22) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE TZDATA 2009B-1 (USING .../TZDATA_2009C-1_ALL.DEB) ...
+UNPACKING REPLACEMENT TZDATA ...
+SETTING UP TZDATA (2009C-1) ...
+
+CURRENT DEFAULT TIMEZONE: 'ETC/UTC'
+LOCAL TIME IS NOW:      SAT MAR 21 02:33:16 UTC 2009.
+UNIVERSAL TIME IS NOW:  SAT MAR 21 02:33:16 UTC 2009.
+RUN 'DPKG-RECONFIGURE TZDATA' IF YOU WISH TO CHANGE IT.
+
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE ZLIB1G 1:1.2.3.3.DFSG-12 (USING .../ZLIB1G_1%3A1.2.3.3.DFSG-13_AMD64.DEB) ...
+UNPACKING REPLACEMENT ZLIB1G ...
+SETTING UP ZLIB1G (1:1.2.3.3.DFSG-13) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE LIBNCURSESW5 5.7+20090228-1 (USING .../LIBNCURSESW5_5.7+20090314-1_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBNCURSESW5 ...
+PREPARING TO REPLACE LIBDEVMAPPER1.02.1 2:1.02.27-4 (USING .../LIBDEVMAPPER1.02.1_2%3A1.02.30-3_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBDEVMAPPER1.02.1 ...
+SETTING UP LINUX-LIBC-DEV (2.6.28-1) ...
+SETTING UP LIBC6-DEV (2.9-6) ...
+SETTING UP LIBGOMP1 (4.3.3-5) ...
+SETTING UP CPP-4.3 (4.3.3-5) ...
+SETTING UP GCC-4.3 (4.3.3-5) ...
+SETTING UP LIBNCURSESW5 (5.7+20090314-1) ...
+SETTING UP LIBDEVMAPPER1.02.1 (2:1.02.30-3) ...
+SETTING UP G++-4.3 (4.3.3-5) ...
+SETTING UP LIBSTDC++6-4.3-DEV (4.3.3-5) ...
 Reading package lists...
 Building dependency tree...
 Reading state information...
diff --git a/testsuite/normal/pbuilder-update-lenny-squeeze.log b/testsuite/normal/pbuilder-update-lenny-squeeze.log
index 14bf1a2..39aa888 100644
--- a/testsuite/normal/pbuilder-update-lenny-squeeze.log
+++ b/testsuite/normal/pbuilder-update-lenny-squeeze.log
@@ -9,135 +9,264 @@ I: mounting /dev/pts filesystem
 I: policy-rc.d already exists
 I: Refreshing the base.tgz 
 I: upgrading packages
-Get:1 http://localhost squeeze Release.gpg [189B]
-Get:2 http://localhost squeeze Release [68.7kB]
+Get:1 http://localhost squeeze Release.gpg [197B]
+Get:2 http://localhost squeeze Release [71.6kB]
 Ign http://localhost squeeze/main Packages
-Get:3 http://localhost squeeze/main Packages [7175kB]
+Get:3 http://localhost squeeze/main Packages [7262kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 Reading package lists...
 Building dependency tree...
 Reading state information...
+The following NEW packages will be installed:
+  libdb4.7
 The following packages will be upgraded:
-  aptitude binutils cpio cpp-4.3 debianutils g++-4.3 gcc-4.3 gcc-4.3-base grep
-  gzip libdb4.6 libept0 libgcc1 libgdbm3 libgomp1 libmpfr1ldbl libsepol1
-  libstdc++6 libstdc++6-4.3-dev mawk mktemp sed tzdata
-23 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 21.8MB of archives.
-After this operation, 1950kB of additional disk space will be used.
-Get:1 http://localhost squeeze/main debianutils 2.31 [56.0kB]
-Get:2 http://localhost squeeze/main grep 2.5.4-2 [315kB]
-Get:3 http://localhost squeeze/main gzip 1.3.12-7 [107kB]
-Get:4 http://localhost squeeze/main mktemp 1.6-1 [11.8kB]
-Get:5 http://localhost squeeze/main sed 4.1.5-8 [254kB]
-Get:6 http://localhost squeeze/main mawk 1.3.3-14 [90.5kB]
-Get:7 http://localhost squeeze/main libgomp1 4.3.3-3 [15.5kB]
-Get:8 http://localhost squeeze/main gcc-4.3-base 4.3.3-3 [104kB]
-Get:9 http://localhost squeeze/main libstdc++6 4.3.3-3 [334kB]
-Get:10 http://localhost squeeze/main cpp-4.3 4.3.3-3 [3372kB]
-Get:11 http://localhost squeeze/main gcc-4.3 4.3.3-3 [2609kB]
-Get:12 http://localhost squeeze/main g++-4.3 4.3.3-3 [4801kB]
-Get:13 http://localhost squeeze/main libstdc++6-4.3-dev 4.3.3-3 [1428kB]
+  aptitude base-files bash binutils cpio cpp cpp-4.3 debconf debconf-i18n
+  debianutils findutils g++ g++-4.3 gcc gcc-4.3 gcc-4.3-base gnupg gpgv grep
+  gzip libc6 libc6-dev libdb4.6 libept0 libgcc1 libgdbm3 libgmp3c2 libgomp1
+  libmpfr1ldbl libncurses5 libncursesw5 libpam-modules libpam-runtime libpam0g
+  libreadline5 libsepol1 libstdc++6 libstdc++6-4.3-dev libxapian15 mawk mktemp
+  ncurses-base ncurses-bin readline-common sed tzdata
+46 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 36.9MB of archives.
+After this operation, 4481kB of additional disk space will be used.
+Get:1 http://localhost squeeze/main base-files 5.0 [73.2kB]
+Get:2 http://localhost squeeze/main debianutils 2.31 [56.0kB]
+Get:3 http://localhost squeeze/main bash 3.2-5 [643kB]
+Get:4 http://localhost squeeze/main findutils 4.4.0-3 [631kB]
+Get:5 http://localhost squeeze/main grep 2.5.4-3 [316kB]
+Get:6 http://localhost squeeze/main gzip 1.3.12-8 [107kB]
+Get:7 http://localhost squeeze/main mktemp 1.6-1 [11.8kB]
+Get:8 http://localhost squeeze/main ncurses-bin 5.7+20090228-1 [310kB]
+Get:9 http://localhost squeeze/main sed 4.1.5-8 [254kB]
+Get:10 http://localhost squeeze/main libc6-dev 2.9-4 [2521kB]
+Get:11 http://localhost squeeze/main libgomp1 4.3.3-3 [15.5kB]
+Get:12 http://localhost squeeze/main cpp-4.3 4.3.3-3 [3372kB]
+Get:13 http://localhost squeeze/main gcc-4.3-base 4.3.3-3 [104kB]
 Get:14 http://localhost squeeze/main libgcc1 1:4.3.3-3 [44.5kB]
-Get:15 http://localhost squeeze/main libmpfr1ldbl 2.3.2.dfsg.1-1 [360kB]
-Get:16 http://localhost squeeze/main binutils 2.19.1-1 [2921kB]
-Get:17 http://localhost squeeze/main libdb4.6 4.6.21-13 [593kB]
-Get:18 http://localhost squeeze/main libsepol1 2.0.32-1 [125kB]
-Get:19 http://localhost squeeze/main tzdata 2009b-1 [752kB]
-Get:20 http://localhost squeeze/main libept0 0.5.26 [205kB]
-Get:21 http://localhost squeeze/main aptitude 0.4.11.11-1 [3068kB]
-Get:22 http://localhost squeeze/main cpio 2.9-15 [182kB]
-Get:23 http://localhost squeeze/main libgdbm3 1.8.3-4 [24.2kB]
+Get:15 http://localhost squeeze/main gcc-4.3 4.3.3-3 [2609kB]
+Get:16 http://localhost squeeze/main g++-4.3 4.3.3-3 [4801kB]
+Get:17 http://localhost squeeze/main libstdc++6-4.3-dev 4.3.3-3 [1428kB]
+Get:18 http://localhost squeeze/main libstdc++6 4.3.3-3 [334kB]
+Get:19 http://localhost squeeze/main libgmp3c2 2:4.2.4+dfsg-2 [215kB]
+Get:20 http://localhost squeeze/main libmpfr1ldbl 2.4.1-1 [418kB]
+Get:21 http://localhost squeeze/main binutils 2.19.1-1 [2921kB]
+Get:22 http://localhost squeeze/main libc6 2.9-4 [4935kB]
+Get:23 http://localhost squeeze/main libncurses5 5.7+20090228-1 [354kB]
+Get:24 http://localhost squeeze/main ncurses-base 5.7+20090228-1 [179kB]
+Get:25 http://localhost squeeze/main debconf-i18n 1.5.26 [177kB]
+Get:26 http://localhost squeeze/main debconf 1.5.26 [149kB]
+Get:27 http://localhost squeeze/main libdb4.7 4.7.25-6 [654kB]
+Get:28 http://localhost squeeze/main libpam-modules 1.0.1-7 [308kB]
+Get:29 http://localhost squeeze/main mawk 1.3.3-14 [90.5kB]
+Get:30 http://localhost squeeze/main readline-common 5.2-4 [50.9kB]
+Get:31 http://localhost squeeze/main libreadline5 5.2-4 [147kB]
+Get:32 http://localhost squeeze/main gpgv 1.4.9-4 [183kB]
+Get:33 http://localhost squeeze/main gnupg 1.4.9-4 [2047kB]
+Get:34 http://localhost squeeze/main libpam-runtime 1.0.1-7 [177kB]
+Get:35 http://localhost squeeze/main libpam0g 1.0.1-7 [107kB]
+Get:36 http://localhost squeeze/main libsepol1 2.0.32-1 [125kB]
+Get:37 http://localhost squeeze/main tzdata 2009b-1 [752kB]
+Get:38 http://localhost squeeze/main libxapian15 1.0.10-2 [810kB]
+Get:39 http://localhost squeeze/main libept0 0.5.26 [205kB]
+Get:40 http://localhost squeeze/main libncursesw5 5.7+20090228-1 [376kB]
+Get:41 http://localhost squeeze/main aptitude 0.4.11.11-1 [3068kB]
+Get:42 http://localhost squeeze/main cpio 2.9.90-3 [182kB]
+Get:43 http://localhost squeeze/main libgdbm3 1.8.3-4 [24.2kB]
+Get:44 http://localhost squeeze/main libdb4.6 4.6.21-13 [593kB]
+Get:45 http://localhost squeeze/main cpp 4:4.3.3-2 [14.1kB]
+Get:46 http://localhost squeeze/main gcc 4:4.3.3-2 [4998B]
+Get:47 http://localhost squeeze/main g++ 4:4.3.3-2 [1374B]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
-(Reading database ... 9656 files and directories currently installed.)
-Preparing to replace debianutils 2.30 (using .../debianutils_2.31_amd64.deb) ...
-Unpacking replacement debianutils ...
-Setting up debianutils (2.31) ...
-(Reading database ... 9656 files and directories currently installed.)
-Preparing to replace grep 2.5.3~dfsg-6 (using .../grep_2.5.4-2_amd64.deb) ...
-Unpacking replacement grep ...
-Setting up grep (2.5.4-2) ...
-(Reading database ... 9657 files and directories currently installed.)
-Preparing to replace gzip 1.3.12-6 (using .../gzip_1.3.12-7_amd64.deb) ...
-Unpacking replacement gzip ...
-Setting up gzip (1.3.12-7) ...
-(Reading database ... 9657 files and directories currently installed.)
-Preparing to replace mktemp 1.5-9 (using .../mktemp_1.6-1_amd64.deb) ...
-Unpacking replacement mktemp ...
-Setting up mktemp (1.6-1) ...
-(Reading database ... 9657 files and directories currently installed.)
-Preparing to replace sed 4.1.5-6 (using .../archives/sed_4.1.5-8_amd64.deb) ...
-Unpacking replacement sed ...
-Setting up sed (4.1.5-8) ...
-(Reading database ... 9657 files and directories currently installed.)
-Preparing to replace mawk 1.3.3-11.1 (using .../mawk_1.3.3-14_amd64.deb) ...
-Unpacking replacement mawk ...
-Preparing to replace libgomp1 4.3.2-1.1 (using .../libgomp1_4.3.3-3_amd64.deb) ...
-Unpacking replacement libgomp1 ...
-Preparing to replace gcc-4.3-base 4.3.2-1.1 (using .../gcc-4.3-base_4.3.3-3_amd64.deb) ...
-Unpacking replacement gcc-4.3-base ...
-Setting up gcc-4.3-base (4.3.3-3) ...
-(Reading database ... 9657 files and directories currently installed.)
-Preparing to replace libstdc++6 4.3.2-1.1 (using .../libstdc++6_4.3.3-3_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.3.3-3) ...
-(Reading database ... 9657 files and directories currently installed.)
-Preparing to replace cpp-4.3 4.3.2-1.1 (using .../cpp-4.3_4.3.3-3_amd64.deb) ...
-Unpacking replacement cpp-4.3 ...
-Preparing to replace gcc-4.3 4.3.2-1.1 (using .../gcc-4.3_4.3.3-3_amd64.deb) ...
-Unpacking replacement gcc-4.3 ...
-Preparing to replace g++-4.3 4.3.2-1.1 (using .../g++-4.3_4.3.3-3_amd64.deb) ...
-Unpacking replacement g++-4.3 ...
-Preparing to replace libstdc++6-4.3-dev 4.3.2-1.1 (using .../libstdc++6-4.3-dev_4.3.3-3_amd64.deb) ...
-Unpacking replacement libstdc++6-4.3-dev ...
-Preparing to replace libgcc1 1:4.3.2-1.1 (using .../libgcc1_1%3a4.3.3-3_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up libgcc1 (1:4.3.3-3) ...
-(Reading database ... 9666 files and directories currently installed.)
-Preparing to replace libmpfr1ldbl 2.3.1.dfsg.1-2 (using .../libmpfr1ldbl_2.3.2.dfsg.1-1_amd64.deb) ...
-Unpacking replacement libmpfr1ldbl ...
-Preparing to replace binutils 2.18.1~cvs20080103-7 (using .../binutils_2.19.1-1_amd64.deb) ...
-Unpacking replacement binutils ...
-Preparing to replace libdb4.6 4.6.21-11 (using .../libdb4.6_4.6.21-13_amd64.deb) ...
-Unpacking replacement libdb4.6 ...
-Setting up libdb4.6 (4.6.21-13) ...
-(Reading database ... 9671 files and directories currently installed.)
-Preparing to replace libsepol1 2.0.30-2 (using .../libsepol1_2.0.32-1_amd64.deb) ...
-Unpacking replacement libsepol1 ...
-Setting up libsepol1 (2.0.32-1) ...
-telinit: timeout opening/writing control channel /dev/initctl
-(Reading database ... 9671 files and directories currently installed.)
-Preparing to replace tzdata 2008h-2 (using .../tzdata_2009b-1_all.deb) ...
-Unpacking replacement tzdata ...
-Setting up tzdata (2009b-1) ...
-
-Current default timezone: 'Etc/UTC'
+(Reading database ... 9656 files and directories currently installed.)
+Preparing to replace base-files 5 (using .../base-files_5.0_amd64.deb) ...
+Unpacking replacement base-files ...
+Setting up base-files (5.0) ...
+Installing new version of config file /etc/debian_version ...
+Installing new version of config file /etc/issue ...
+Installing new version of config file /etc/issue.net ...
+(Reading database ... 9657 files and directories currently installed.)
+Preparing to replace debianutils 2.30 (using .../debianutils_2.31_amd64.deb) ...
+Unpacking replacement debianutils ...
+Setting up debianutils (2.31) ...
+(Reading database ... 9657 files and directories currently installed.)
+Preparing to replace bash 3.2-4 (using .../archives/bash_3.2-5_amd64.deb) ...
+Unpacking replacement bash ...
+Setting up bash (3.2-5) ...
+(Reading database ... 9657 files and directories currently installed.)
+Preparing to replace findutils 4.4.0-2 (using .../findutils_4.4.0-3_amd64.deb) ...
+Unpacking replacement findutils ...
+Setting up findutils (4.4.0-3) ...
+(Reading database ... 9657 files and directories currently installed.)
+Preparing to replace grep 2.5.3~dfsg-6 (using .../grep_2.5.4-3_amd64.deb) ...
+Unpacking replacement grep ...
+Setting up grep (2.5.4-3) ...
+(Reading database ... 9658 files and directories currently installed.)
+Preparing to replace gzip 1.3.12-6 (using .../gzip_1.3.12-8_amd64.deb) ...
+Unpacking replacement gzip ...
+Setting up gzip (1.3.12-8) ...
+(Reading database ... 9658 files and directories currently installed.)
+Preparing to replace mktemp 1.5-9 (using .../mktemp_1.6-1_amd64.deb) ...
+Unpacking replacement mktemp ...
+Setting up mktemp (1.6-1) ...
+(Reading database ... 9658 files and directories currently installed.)
+Preparing to replace ncurses-bin 5.7+20081213-1 (using .../ncurses-bin_5.7+20090228-1_amd64.deb) ...
+Unpacking replacement ncurses-bin ...
+Setting up ncurses-bin (5.7+20090228-1) ...
+(Reading database ... 9658 files and directories currently installed.)
+Preparing to replace sed 4.1.5-6 (using .../archives/sed_4.1.5-8_amd64.deb) ...
+Unpacking replacement sed ...
+Setting up sed (4.1.5-8) ...
+(Reading database ... 9658 files and directories currently installed.)
+Preparing to replace libc6-dev 2.7-18 (using .../libc6-dev_2.9-4_amd64.deb) ...
+Unpacking replacement libc6-dev ...
+Preparing to replace libgomp1 4.3.2-1.1 (using .../libgomp1_4.3.3-3_amd64.deb) ...
+Unpacking replacement libgomp1 ...
+Preparing to replace cpp-4.3 4.3.2-1.1 (using .../cpp-4.3_4.3.3-3_amd64.deb) ...
+Unpacking replacement cpp-4.3 ...
+Preparing to replace gcc-4.3-base 4.3.2-1.1 (using .../gcc-4.3-base_4.3.3-3_amd64.deb) ...
+Unpacking replacement gcc-4.3-base ...
+Setting up gcc-4.3-base (4.3.3-3) ...
+(Reading database ... 9663 files and directories currently installed.)
+Preparing to replace libgcc1 1:4.3.2-1.1 (using .../libgcc1_1%3a4.3.3-3_amd64.deb) ...
+Unpacking replacement libgcc1 ...
+Setting up libgcc1 (1:4.3.3-3) ...
+(Reading database ... 9663 files and directories currently installed.)
+Preparing to replace gcc-4.3 4.3.2-1.1 (using .../gcc-4.3_4.3.3-3_amd64.deb) ...
+Unpacking replacement gcc-4.3 ...
+Preparing to replace g++-4.3 4.3.2-1.1 (using .../g++-4.3_4.3.3-3_amd64.deb) ...
+Unpacking replacement g++-4.3 ...
+Preparing to replace libstdc++6-4.3-dev 4.3.2-1.1 (using .../libstdc++6-4.3-dev_4.3.3-3_amd64.deb) ...
+Unpacking replacement libstdc++6-4.3-dev ...
+Preparing to replace libstdc++6 4.3.2-1.1 (using .../libstdc++6_4.3.3-3_amd64.deb) ...
+Unpacking replacement libstdc++6 ...
+Setting up libstdc++6 (4.3.3-3) ...
+(Reading database ... 9672 files and directories currently installed.)
+Preparing to replace libgmp3c2 2:4.2.2+dfsg-3 (using .../libgmp3c2_2%3a4.2.4+dfsg-2_amd64.deb) ...
+Unpacking replacement libgmp3c2 ...
+Preparing to replace libmpfr1ldbl 2.3.1.dfsg.1-2 (using .../libmpfr1ldbl_2.4.1-1_amd64.deb) ...
+Unpacking replacement libmpfr1ldbl ...
+Preparing to replace binutils 2.18.1~cvs20080103-7 (using .../binutils_2.19.1-1_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace libc6 2.7-18 (using .../archives/libc6_2.9-4_amd64.deb) ...
+Checking for services that may need to be restarted...
+Checking init scripts...
+Unpacking replacement libc6 ...
+Setting up libc6 (2.9-4) ...
+Installing new version of config file /etc/init.d/glibc.sh ...
+Installing new version of config file /etc/gai.conf ...
+Checking for services that may need to be restarted...
+Checking init scripts...
+Nothing to restart.
+(Reading database ... 9681 files and directories currently installed.)
+Preparing to replace libncurses5 5.7+20081213-1 (using .../libncurses5_5.7+20090228-1_amd64.deb) ...
+Unpacking replacement libncurses5 ...
+Setting up libncurses5 (5.7+20090228-1) ...
+(Reading database ... 9681 files and directories currently installed.)
+Preparing to replace ncurses-base 5.7+20081213-1 (using .../ncurses-base_5.7+20090228-1_all.deb) ...
+Unpacking replacement ncurses-base ...
+Setting up ncurses-base (5.7+20090228-1) ...
+(Reading database ... 9681 files and directories currently installed.)
+Preparing to replace debconf-i18n 1.5.24 (using .../debconf-i18n_1.5.26_all.deb) ...
+Unpacking replacement debconf-i18n ...
+Setting up debconf-i18n (1.5.26) ...
+(Reading database ... 9681 files and directories currently installed.)
+Preparing to replace debconf 1.5.24 (using .../debconf_1.5.26_all.deb) ...
+Unpacking replacement debconf ...
+Setting up debconf (1.5.26) ...
+Selecting previously deselected package libdb4.7.
+(Reading database ... 9681 files and directories currently installed.)
+Unpacking libdb4.7 (from .../libdb4.7_4.7.25-6_amd64.deb) ...
+Setting up libdb4.7 (4.7.25-6) ...
+(Reading database ... 9685 files and directories currently installed.)
+Preparing to replace libpam-modules 1.0.1-5 (using .../libpam-modules_1.0.1-7_amd64.deb) ...
+Unpacking replacement libpam-modules ...
+Setting up libpam-modules (1.0.1-7) ...
+Installing new version of config file /etc/security/limits.conf ...
+(Reading database ... 9685 files and directories currently installed.)
+Preparing to replace mawk 1.3.3-11.1 (using .../mawk_1.3.3-14_amd64.deb) ...
+Unpacking replacement mawk ...
+Preparing to replace readline-common 5.2-3.1 (using .../readline-common_5.2-4_all.deb) ...
+Unpacking replacement readline-common ...
+Setting up readline-common (5.2-4) ...
+(Reading database ... 9685 files and directories currently installed.)
+Preparing to replace libreadline5 5.2-3.1 (using .../libreadline5_5.2-4_amd64.deb) ...
+Unpacking replacement libreadline5 ...
+Setting up libreadline5 (5.2-4) ...
+(Reading database ... 9685 files and directories currently installed.)
+Preparing to replace gpgv 1.4.9-3 (using .../gpgv_1.4.9-4_amd64.deb) ...
+Unpacking replacement gpgv ...
+Setting up gpgv (1.4.9-4) ...
+(Reading database ... 9685 files and directories currently installed.)
+Preparing to replace gnupg 1.4.9-3 (using .../gnupg_1.4.9-4_amd64.deb) ...
+Unpacking replacement gnupg ...
+Setting up gnupg (1.4.9-4) ...
+(Reading database ... 9687 files and directories currently installed.)
+Preparing to replace libpam-runtime 1.0.1-5 (using .../libpam-runtime_1.0.1-7_all.deb) ...
+Unpacking replacement libpam-runtime ...
+Setting up libpam-runtime (1.0.1-7) ...
+(Reading database ... 9694 files and directories currently installed.)
+Preparing to replace libpam0g 1.0.1-5 (using .../libpam0g_1.0.1-7_amd64.deb) ...
+Unpacking replacement libpam0g ...
+Setting up libpam0g (1.0.1-7) ...
+(Reading database ... 9694 files and directories currently installed.)
+Preparing to replace libsepol1 2.0.30-2 (using .../libsepol1_2.0.32-1_amd64.deb) ...
+Unpacking replacement libsepol1 ...
+Setting up libsepol1 (2.0.32-1) ...
+telinit: timeout opening/writing control channel /dev/initctl
+(Reading database ... 9694 files and directories currently installed.)
+Preparing to replace tzdata 2008h-2 (using .../tzdata_2009b-1_all.deb) ...
+Unpacking replacement tzdata ...
+Setting up tzdata (2009b-1) ...
+
+Current default timezone: 'Etc/UTC'
 Local time is now: XXXX
 Universal Time is now: XXXX
-Run 'dpkg-reconfigure tzdata' if you wish to change it.
-
-(Reading database ... 9677 files and directories currently installed.)
-Preparing to replace libept0 0.5.22 (using .../libept0_0.5.26_amd64.deb) ...
-Unpacking replacement libept0 ...
-Preparing to replace aptitude 0.4.11.11-1~lenny1 (using .../aptitude_0.4.11.11-1_amd64.deb) ...
-Unpacking replacement aptitude ...
-Preparing to replace cpio 2.9-13 (using .../archives/cpio_2.9-15_amd64.deb) ...
-Unpacking replacement cpio ...
-Preparing to replace libgdbm3 1.8.3-3 (using .../libgdbm3_1.8.3-4_amd64.deb) ...
-Unpacking replacement libgdbm3 ...
-Setting up mawk (1.3.3-14) ...
-Setting up libgomp1 (4.3.3-3) ...
-Setting up libmpfr1ldbl (2.3.2.dfsg.1-1) ...
-Setting up cpp-4.3 (4.3.3-3) ...
-Setting up binutils (2.19.1-1) ...
-Setting up gcc-4.3 (4.3.3-3) ...
-Setting up libept0 (0.5.26) ...
-Setting up aptitude (0.4.11.11-1) ...
-Setting up cpio (2.9-15) ...
-Setting up libgdbm3 (1.8.3-4) ...
-Setting up g++-4.3 (4.3.3-3) ...
-Setting up libstdc++6-4.3-dev (4.3.3-3) ...
+Run 'dpkg-reconfigure tzdata' if you wish to change it.
+
+(Reading database ... 9700 files and directories currently installed.)
+Preparing to replace libxapian15 1.0.7-4 (using .../libxapian15_1.0.10-2_amd64.deb) ...
+Unpacking replacement libxapian15 ...
+Preparing to replace libept0 0.5.22 (using .../libept0_0.5.26_amd64.deb) ...
+Unpacking replacement libept0 ...
+Preparing to replace libncursesw5 5.7+20081213-1 (using .../libncursesw5_5.7+20090228-1_amd64.deb) ...
+Unpacking replacement libncursesw5 ...
+Preparing to replace aptitude 0.4.11.11-1~lenny1 (using .../aptitude_0.4.11.11-1_amd64.deb) ...
+Unpacking replacement aptitude ...
+Preparing to replace cpio 2.9-13 (using .../cpio_2.9.90-3_amd64.deb) ...
+Unpacking replacement cpio ...
+Preparing to replace libgdbm3 1.8.3-3 (using .../libgdbm3_1.8.3-4_amd64.deb) ...
+Unpacking replacement libgdbm3 ...
+Preparing to replace libdb4.6 4.6.21-11 (using .../libdb4.6_4.6.21-13_amd64.deb) ...
+Unpacking replacement libdb4.6 ...
+Preparing to replace cpp 4:4.3.2-2 (using .../cpp_4%3a4.3.3-2_amd64.deb) ...
+Unpacking replacement cpp ...
+Preparing to replace gcc 4:4.3.2-2 (using .../gcc_4%3a4.3.3-2_amd64.deb) ...
+Removing old gcc doc directory.
+Unpacking replacement gcc ...
+Preparing to replace g++ 4:4.3.2-2 (using .../g++_4%3a4.3.3-2_amd64.deb) ...
+Unpacking replacement g++ ...
+Setting up libc6-dev (2.9-4) ...
+Setting up libgomp1 (4.3.3-3) ...
+Setting up libgmp3c2 (2:4.2.4+dfsg-2) ...
+Setting up libmpfr1ldbl (2.4.1-1) ...
+Setting up cpp-4.3 (4.3.3-3) ...
+Setting up binutils (2.19.1-1) ...
+Setting up gcc-4.3 (4.3.3-3) ...
+Setting up mawk (1.3.3-14) ...
+Setting up libxapian15 (1.0.10-2) ...
+Setting up libept0 (0.5.26) ...
+Setting up libncursesw5 (5.7+20090228-1) ...
+Setting up aptitude (0.4.11.11-1) ...
+Setting up cpio (2.9.90-3) ...
+Setting up libgdbm3 (1.8.3-4) ...
+Setting up libdb4.6 (4.6.21-13) ...
+Setting up cpp (4:4.3.3-2) ...
+Setting up gcc (4:4.3.3-2) ...
+Setting up g++-4.3 (4.3.3-3) ...
+Setting up g++ (4:4.3.3-2) ...
+Setting up libstdc++6-4.3-dev (4.3.3-3) ...
 Reading package lists...
 Building dependency tree...
 Reading state information...
diff --git a/testsuite/normal/pbuilder-update-squeeze-sid-experimental.log b/testsuite/normal/pbuilder-update-squeeze-sid-experimental.log
index ea7a264..7ab2107 100644
--- a/testsuite/normal/pbuilder-update-squeeze-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-squeeze-sid-experimental.log
@@ -11,13 +11,13 @@ I: policy-rc.d already exists
 I: Refreshing the base.tgz 
 I: upgrading packages
 Hit http://localhost sid Release.gpg
-Get:1 http://localhost experimental Release.gpg [189B]
+Get:1 http://localhost experimental Release.gpg [197B]
 Hit http://localhost sid Release
-Get:2 http://localhost experimental Release [74.0kB]
+Get:2 http://localhost experimental Release [76.6kB]
 Ign http://localhost sid/main Packages/DiffIndex
 Ign http://localhost experimental/main Packages
 Ign http://localhost sid/main Packages
-Get:3 http://localhost experimental/main Packages [766kB]
+Get:3 http://localhost experimental/main Packages [573kB]
 Hit http://localhost sid/main Packages
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
@@ -25,61 +25,79 @@ Reading package lists...
 Building dependency tree...
 Reading state information...
 The following NEW packages will be installed:
-  libdb4.5 libsqlite3-0 libssl0.9.8 lsb-release mime-support python
+  libdb4.5 libicu40 libsqlite3-0 libssl0.9.8 lsb-release mime-support python
   python-central python-debian python-minimal python-support python-xapian
   python2.5 python2.5-minimal
 The following packages have been kept back:
   apt aptitude
 The following packages will be upgraded:
-  bsdutils diff libsigc++-2.0-0c2a mount util-linux
-5 upgraded, 13 newly installed, 0 to remove and 2 not upgraded.
-Need to get 8083kB of archives.
-After this operation, 24.3MB of additional disk space will be used.
-Get:1 http://localhost experimental/main diff 2.8.7-0.2 [248kB]
-Get:2 http://localhost experimental/main mount 2.14~rc2-0 [145kB]
-Get:3 http://localhost experimental/main util-linux 2.14~rc2-0 [550kB]
-Get:4 http://localhost experimental/main bsdutils 1:2.14~rc2-0 [64.7kB]
-Get:5 http://localhost experimental/main libsigc++-2.0-0c2a 2.2.2-1 [35.3kB]
-Get:6 http://localhost sid/main libssl0.9.8 0.9.8g-15 [975kB]
-Get:7 http://localhost sid/main libdb4.5 4.5.20-13 [555kB]
-Get:8 http://localhost experimental/main libsqlite3-0 3.6.10-1 [287kB]
-Get:9 http://localhost sid/main mime-support 3.44-1 [33.3kB]
-Get:10 http://localhost sid/main python2.5-minimal 2.5.4-1 [1290kB]
-Get:11 http://localhost sid/main python2.5 2.5.4-1 [3041kB]
-Get:12 http://localhost sid/main python-minimal 2.5.4-1 [13.9kB]
-Get:13 http://localhost sid/main python 2.5.4-1 [142kB]
-Get:14 http://localhost sid/main python-central 0.6.11 [44.8kB]
-Get:15 http://localhost experimental/main python-support 0.90.2 [30.0kB]
-Get:16 http://localhost sid/main python-debian 0.1.12 [53.1kB]
-Get:17 http://localhost sid/main python-xapian 1.0.10-1 [555kB]
-Get:18 http://localhost sid/main lsb-release 3.2-20 [20.0kB]
+  bash binutils bsdutils diff dpkg dpkg-dev libgmp3c2 libsigc++-2.0-0c2a mount
+  util-linux
+10 upgraded, 14 newly installed, 0 to remove and 2 not upgraded.
+Need to get 22.5MB of archives.
+After this operation, 43.5MB of additional disk space will be used.
+Get:1 http://localhost experimental/main bash 4.0-1 [1158kB]
+Get:2 http://localhost experimental/main diff 2.8.7-0.2 [248kB]
+Get:3 http://localhost experimental/main dpkg 1.15.0 [2193kB]
+Get:4 http://localhost experimental/main mount 2.14~rc2-0 [145kB]
+Get:5 http://localhost experimental/main util-linux 2.14~rc2-0 [550kB]
+Get:6 http://localhost experimental/main bsdutils 1:2.14~rc2-0 [64.7kB]
+Get:7 http://localhost experimental/main libsigc++-2.0-0c2a 2.2.2-1 [35.3kB]
+Get:8 http://localhost sid/main libssl0.9.8 0.9.8g-15 [975kB]
+Get:9 http://localhost sid/main libdb4.5 4.5.20-13 [555kB]
+Get:10 http://localhost sid/main libicu40 4.0.1-2 [6944kB]
+Get:11 http://localhost sid/main libsqlite3-0 3.6.11-1 [293kB]
+Get:12 http://localhost sid/main mime-support 3.44-1 [33.3kB]
+Get:13 http://localhost sid/main python2.5-minimal 2.5.4-1 [1290kB]
+Get:14 http://localhost sid/main python2.5 2.5.4-1 [3041kB]
+Get:15 http://localhost experimental/main python-minimal 2.5.4-3 [13.9kB]
+Get:16 http://localhost experimental/main python 2.5.4-3 [142kB]
+Get:17 http://localhost sid/main python-central 0.6.11 [44.8kB]
+Get:18 http://localhost experimental/main binutils 2.19.51.20090315-1 [3150kB]
+Get:19 http://localhost experimental/main dpkg-dev 1.15.0 [760kB]
+Get:20 http://localhost experimental/main libgmp3c2 2:4.2.4+dfsg-4 [207kB]
+Get:21 http://localhost experimental/main python-support 0.90.3 [30.8kB]
+Get:22 http://localhost sid/main python-debian 0.1.12 [53.1kB]
+Get:23 http://localhost sid/main python-xapian 1.0.10-1 [555kB]
+Get:24 http://localhost sid/main lsb-release 3.2-22 [21.1kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
-(Reading database ... 9767 files and directories currently installed.)
+(Reading database ... 9780 files and directories currently installed.)
+Preparing to replace bash 3.2-5 (using .../archives/bash_4.0-1_amd64.deb) ...
+Unpacking replacement bash ...
+Setting up bash (4.0-1) ...
+(Reading database ... 9801 files and directories currently installed.)
 Preparing to replace diff 2.8.1-12 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
-(Reading database ... 9775 files and directories currently installed.)
+(Reading database ... 9809 files and directories currently installed.)
+Preparing to replace dpkg 1.14.25 (using .../archives/dpkg_1.15.0_amd64.deb) ...
+Unpacking replacement dpkg ...
+Setting up dpkg (1.15.0) ...
+Installing new version of config file /etc/logrotate.d/dpkg ...
+(Reading database ... 
+(Reading database ...   5%
+(Reading database ...  10%
+(Reading database ...  15%
+(Reading database ...  20%
+(Reading database ...  25%
+(Reading database ...  30%
+(Reading database ...  35%
+(Reading database ...  40%
+(Reading database ...  45%
+(Reading database ...  50%
+(Reading database ...  55%
+(Reading database ...  60%
+(Reading database ...  65%
+(Reading database ...  70%
+(Reading database ...  75%
+(Reading database ...  80%
+(Reading database ...  85%
+(Reading database ...  90%
+(Reading database ...  95%
+(Reading database ... 100%
+(Reading database ... 9801 files and directories currently installed.)
 Preparing to replace mount 2.13.1.1-1 (using .../mount_2.14~rc2-0_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.14~rc2-0) ...
-(Reading database ... 9775 files and directories currently installed.)
+(Reading database ... 
+(Reading database ...   5%
+(Reading database ...  10%
+(Reading database ...  15%
+(Reading database ...  20%
+(Reading database ...  25%
+(Reading database ...  30%
+(Reading database ...  35%
+(Reading database ...  40%
+(Reading database ...  45%
+(Reading database ...  50%
+(Reading database ...  55%
+(Reading database ...  60%
+(Reading database ...  65%
+(Reading database ...  70%
+(Reading database ...  75%
+(Reading database ...  80%
+(Reading database ...  85%
+(Reading database ...  90%
+(Reading database ...  95%
+(Reading database ... 100%
+(Reading database ... 9801 files and directories currently installed.)
 Preparing to replace util-linux 2.13.1.1-1 (using .../util-linux_2.14~rc2-0_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.14~rc2-0) ...
-(Reading database ... 9777 files and directories currently installed.)
+(Reading database ... 
+(Reading database ...   5%
+(Reading database ...  10%
+(Reading database ...  15%
+(Reading database ...  20%
+(Reading database ...  25%
+(Reading database ...  30%
+(Reading database ...  35%
+(Reading database ...  40%
+(Reading database ...  45%
+(Reading database ...  50%
+(Reading database ...  55%
+(Reading database ...  60%
+(Reading database ...  65%
+(Reading database ...  70%
+(Reading database ...  75%
+(Reading database ...  80%
+(Reading database ...  85%
+(Reading database ...  90%
+(Reading database ...  95%
+(Reading database ... 100%
+(Reading database ... 9803 files and directories currently installed.)
 Preparing to replace bsdutils 1:2.13.1.1-1 (using .../bsdutils_1%3a2.14~rc2-0_amd64.deb) ...
 Unpacking replacement bsdutils ...
 Setting up bsdutils (1:2.14~rc2-0) ...
-(Reading database ... 9777 files and directories currently installed.)
+(Reading database ... 
+(Reading database ...   5%
+(Reading database ...  10%
+(Reading database ...  15%
+(Reading database ...  20%
+(Reading database ...  25%
+(Reading database ...  30%
+(Reading database ...  35%
+(Reading database ...  40%
+(Reading database ...  45%
+(Reading database ...  50%
+(Reading database ...  55%
+(Reading database ...  60%
+(Reading database ...  65%
+(Reading database ...  70%
+(Reading database ...  75%
+(Reading database ...  80%
+(Reading database ...  85%
+(Reading database ...  90%
+(Reading database ...  95%
+(Reading database ... 100%
+(Reading database ... 9803 files and directories currently installed.)
 Preparing to replace libsigc++-2.0-0c2a 2.0.18-2 (using .../libsigc++-2.0-0c2a_2.2.2-1_amd64.deb) ...
 Unpacking replacement libsigc++-2.0-0c2a ...
 Selecting previously deselected package libssl0.9.8.
 Unpacking libssl0.9.8 (from .../libssl0.9.8_0.9.8g-15_amd64.deb) ...
 Selecting previously deselected package libdb4.5.
 Unpacking libdb4.5 (from .../libdb4.5_4.5.20-13_amd64.deb) ...
+Selecting previously deselected package libicu40.
+Unpacking libicu40 (from .../libicu40_4.0.1-2_amd64.deb) ...
 Selecting previously deselected package libsqlite3-0.
-Unpacking libsqlite3-0 (from .../libsqlite3-0_3.6.10-1_amd64.deb) ...
+Unpacking libsqlite3-0 (from .../libsqlite3-0_3.6.11-1_amd64.deb) ...
 Selecting previously deselected package mime-support.
 Unpacking mime-support (from .../mime-support_3.44-1_all.deb) ...
 Selecting previously deselected package python2.5-minimal.
@@ -87,33 +105,44 @@ Unpacking python2.5-minimal (from .../python2.5-minimal_2.5.4-1_amd64.deb) ...
 Selecting previously deselected package python2.5.
 Unpacking python2.5 (from .../python2.5_2.5.4-1_amd64.deb) ...
 Selecting previously deselected package python-minimal.
-Unpacking python-minimal (from .../python-minimal_2.5.4-1_all.deb) ...
+Unpacking python-minimal (from .../python-minimal_2.5.4-3_all.deb) ...
 Selecting previously deselected package python.
-Unpacking python (from .../python_2.5.4-1_all.deb) ...
+Unpacking python (from .../python_2.5.4-3_all.deb) ...
 Selecting previously deselected package python-central.
 Unpacking python-central (from .../python-central_0.6.11_all.deb) ...
+Preparing to replace binutils 2.19.1-1 (using .../binutils_2.19.51.20090315-1_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace dpkg-dev 1.14.25 (using .../dpkg-dev_1.15.0_all.deb) ...
+Unpacking replacement dpkg-dev ...
+Preparing to replace libgmp3c2 2:4.2.4+dfsg-2 (using .../libgmp3c2_2%3a4.2.4+dfsg-4_amd64.deb) ...
+Unpacking replacement libgmp3c2 ...
 Selecting previously deselected package python-support.
-Unpacking python-support (from .../python-support_0.90.2_all.deb) ...
+Unpacking python-support (from .../python-support_0.90.3_all.deb) ...
 Selecting previously deselected package python-debian.
 Unpacking python-debian (from .../python-debian_0.1.12_all.deb) ...
 Selecting previously deselected package python-xapian.
 Unpacking python-xapian (from .../python-xapian_1.0.10-1_amd64.deb) ...
 Selecting previously deselected package lsb-release.
-Unpacking lsb-release (from .../lsb-release_3.2-20_all.deb) ...
+Unpacking lsb-release (from .../lsb-release_3.2-22_all.deb) ...
 Setting up libsigc++-2.0-0c2a (2.2.2-1) ...
 Setting up libssl0.9.8 (0.9.8g-15) ...
 Setting up libdb4.5 (4.5.20-13) ...
-Setting up libsqlite3-0 (3.6.10-1) ...
+Setting up libicu40 (4.0.1-2) ...
+Setting up libsqlite3-0 (3.6.11-1) ...
 Setting up mime-support (3.44-1) ...
+update-alternatives: using /usr/bin/see to provide /usr/bin/view (view) in auto mode.
 Setting up python2.5-minimal (2.5.4-1) ...
 Setting up python2.5 (2.5.4-1) ...
-Setting up python-minimal (2.5.4-1) ...
-Setting up python (2.5.4-1) ...
+Setting up python-minimal (2.5.4-3) ...
+Setting up python (2.5.4-3) ...
 Setting up python-central (0.6.11) ...
-Setting up python-support (0.90.2) ...
+Setting up binutils (2.19.51.20090315-1) ...
+Setting up dpkg-dev (1.15.0) ...
+Setting up libgmp3c2 (2:4.2.4+dfsg-4) ...
+Setting up python-support (0.90.3) ...
 Setting up python-debian (0.1.12) ...
 Setting up python-xapian (1.0.10-1) ...
-Setting up lsb-release (3.2-20) ...
+Setting up lsb-release (3.2-22) ...
 Processing triggers for python-support ...
 Reading package lists...
 Building dependency tree...
diff --git a/testsuite/normal/pbuilder-update-squeeze-sid.log b/testsuite/normal/pbuilder-update-squeeze-sid.log
index c73c57a..77c01c2 100644
--- a/testsuite/normal/pbuilder-update-squeeze-sid.log
+++ b/testsuite/normal/pbuilder-update-squeeze-sid.log
@@ -9,161 +9,140 @@ I: mounting /dev/pts filesystem
 I: policy-rc.d already exists
 I: Refreshing the base.tgz 
 I: upgrading packages
-Get:1 http://localhost sid Release.gpg [189B]
-Get:2 http://localhost sid Release [74.9kB]
+Get:1 http://localhost sid Release.gpg [197B]
+Get:2 http://localhost sid Release [77.8kB]
 Ign http://localhost sid/main Packages
-Get:3 http://localhost sid/main Packages [7393kB]
+Get:3 http://localhost sid/main Packages [7478kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 Reading package lists...
 Building dependency tree...
 Reading state information...
 The following packages will be upgraded:
-  coreutils cpio cpp cpp-4.3 debconf debconf-i18n g++ g++-4.3 gcc gcc-4.3
-  gcc-4.3-base gnupg gpgv libc6 libc6-dev libdevmapper1.02.1 libgcc1 libgmp3c2
-  libgomp1 libmpfr1ldbl libncurses5 libncursesw5 libselinux1 libstdc++6
-  libstdc++6-4.3-dev libxapian15 linux-libc-dev ncurses-base ncurses-bin
-29 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 31.3MB of archives.
-After this operation, 1946kB of additional disk space will be used.
+  base-passwd coreutils cpp-4.3 g++-4.3 gcc-4.3 gcc-4.3-base libc6 libc6-dev
+  libdevmapper1.02.1 libgcc1 libgomp1 libncurses5 libncursesw5 libselinux1
+  libstdc++6 libstdc++6-4.3-dev linux-libc-dev lsb-base ncurses-base
+  ncurses-bin tzdata zlib1g
+22 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 28.1MB of archives.
+After this operation, 1540kB of additional disk space will be used.
 Get:1 http://localhost sid/main coreutils 7.1-2 [4768kB]
-Get:2 http://localhost sid/main ncurses-bin 5.7+20090214-1 [310kB]
+Get:2 http://localhost sid/main ncurses-bin 5.7+20090314-1 [310kB]
 Get:3 http://localhost sid/main linux-libc-dev 2.6.28-1 [817kB]
-Get:4 http://localhost sid/main libc6-dev 2.9-3 [2519kB]
-Get:5 http://localhost sid/main libgomp1 4.3.3-4 [15.5kB]
-Get:6 http://localhost sid/main cpp-4.3 4.3.3-4 [3373kB]
-Get:7 http://localhost sid/main gcc-4.3-base 4.3.3-4 [106kB]
-Get:8 http://localhost sid/main libgcc1 1:4.3.3-4 [44.5kB]
-Get:9 http://localhost sid/main gcc-4.3 4.3.3-4 [2607kB]
-Get:10 http://localhost sid/main g++-4.3 4.3.3-4 [4817kB]
-Get:11 http://localhost sid/main libstdc++6-4.3-dev 4.3.3-4 [1415kB]
-Get:12 http://localhost sid/main libstdc++6 4.3.3-4 [334kB]
-Get:13 http://localhost sid/main libgmp3c2 2:4.2.4+dfsg-2 [215kB]
-Get:14 http://localhost sid/main libmpfr1ldbl 2.4.0-5 [417kB]
-Get:15 http://localhost sid/main libc6 2.9-3 [4919kB]
-Get:16 http://localhost sid/main libncurses5 5.7+20090214-1 [355kB]
-Get:17 http://localhost sid/main ncurses-base 5.7+20090214-1 [179kB]
-Get:18 http://localhost sid/main debconf-i18n 1.5.25 [177kB]
-Get:19 http://localhost sid/main debconf 1.5.25 [148kB]
-Get:20 http://localhost sid/main gpgv 1.4.9-4 [183kB]
-Get:21 http://localhost sid/main gnupg 1.4.9-4 [2047kB]
-Get:22 http://localhost sid/main libselinux1 2.0.71-1 [78.8kB]
-Get:23 http://localhost sid/main cpio 2.9.90-2 [184kB]
-Get:24 http://localhost sid/main libncursesw5 5.7+20090214-1 [376kB]
-Get:25 http://localhost sid/main libxapian15 1.0.10-2 [810kB]
-Get:26 http://localhost sid/main libdevmapper1.02.1 2:1.02.30-1 [61.7kB]
-Get:27 http://localhost sid/main cpp 4:4.3.2-3 [13.9kB]
-Get:28 http://localhost sid/main gcc 4:4.3.2-3 [5002B]
-Get:29 http://localhost sid/main g++ 4:4.3.2-3 [1372B]
+Get:4 http://localhost sid/main libc6-dev 2.9-6 [2522kB]
+Get:5 http://localhost sid/main libgomp1 4.3.3-5 [15.4kB]
+Get:6 http://localhost sid/main cpp-4.3 4.3.3-5 [3374kB]
+Get:7 http://localhost sid/main gcc-4.3-base 4.3.3-5 [106kB]
+Get:8 http://localhost sid/main libgcc1 1:4.3.3-5 [44.5kB]
+Get:9 http://localhost sid/main gcc-4.3 4.3.3-5 [2610kB]
+Get:10 http://localhost sid/main g++-4.3 4.3.3-5 [4821kB]
+Get:11 http://localhost sid/main libstdc++6-4.3-dev 4.3.3-5 [1423kB]
+Get:12 http://localhost sid/main libstdc++6 4.3.3-5 [334kB]
+Get:13 http://localhost sid/main libc6 2.9-6 [4936kB]
+Get:14 http://localhost sid/main base-passwd 3.5.21 [42.0kB]
+Get:15 http://localhost sid/main libncurses5 5.7+20090314-1 [355kB]
+Get:16 http://localhost sid/main ncurses-base 5.7+20090314-1 [179kB]
+Get:17 http://localhost sid/main libselinux1 2.0.71-1 [78.8kB]
+Get:18 http://localhost sid/main lsb-base 3.2-22 [19.8kB]
+Get:19 http://localhost sid/main tzdata 2009c-1 [782kB]
+Get:20 http://localhost sid/main zlib1g 1:1.2.3.3.dfsg-13 [76.0kB]
+Get:21 http://localhost sid/main libncursesw5 5.7+20090314-1 [377kB]
+Get:22 http://localhost sid/main libdevmapper1.02.1 2:1.02.30-3 [61.8kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
-(Reading database ... 9677 files and directories currently installed.)
-Preparing to replace coreutils 6.10-6 (using .../coreutils_7.1-2_amd64.deb) ...
-Unpacking replacement coreutils ...
-Setting up coreutils (7.1-2) ...
-(Reading database ... 9682 files and directories currently installed.)
-Preparing to replace ncurses-bin 5.7+20081213-1 (using .../ncurses-bin_5.7+20090214-1_amd64.deb) ...
-Unpacking replacement ncurses-bin ...
-Setting up ncurses-bin (5.7+20090214-1) ...
-(Reading database ... 9682 files and directories currently installed.)
-Preparing to replace linux-libc-dev 2.6.26-13 (using .../linux-libc-dev_2.6.28-1_amd64.deb) ...
-Unpacking replacement linux-libc-dev ...
-Preparing to replace libc6-dev 2.7-18 (using .../libc6-dev_2.9-3_amd64.deb) ...
-Unpacking replacement libc6-dev ...
-Preparing to replace libgomp1 4.3.3-3 (using .../libgomp1_4.3.3-4_amd64.deb) ...
-Unpacking replacement libgomp1 ...
-Preparing to replace cpp-4.3 4.3.3-3 (using .../cpp-4.3_4.3.3-4_amd64.deb) ...
-Unpacking replacement cpp-4.3 ...
-Preparing to replace gcc-4.3-base 4.3.3-3 (using .../gcc-4.3-base_4.3.3-4_amd64.deb) ...
-Unpacking replacement gcc-4.3-base ...
-Setting up gcc-4.3-base (4.3.3-4) ...
-(Reading database ... 9762 files and directories currently installed.)
-Preparing to replace libgcc1 1:4.3.3-3 (using .../libgcc1_1%3a4.3.3-4_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up libgcc1 (1:4.3.3-4) ...
-(Reading database ... 9762 files and directories currently installed.)
-Preparing to replace gcc-4.3 4.3.3-3 (using .../gcc-4.3_4.3.3-4_amd64.deb) ...
-Unpacking replacement gcc-4.3 ...
-Preparing to replace g++-4.3 4.3.3-3 (using .../g++-4.3_4.3.3-4_amd64.deb) ...
-Unpacking replacement g++-4.3 ...
-Preparing to replace libstdc++6-4.3-dev 4.3.3-3 (using .../libstdc++6-4.3-dev_4.3.3-4_amd64.deb) ...
-Unpacking replacement libstdc++6-4.3-dev ...
-Preparing to replace libstdc++6 4.3.3-3 (using .../libstdc++6_4.3.3-4_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.3.3-4) ...
-(Reading database ... 9760 files and directories currently installed.)
-Preparing to replace libgmp3c2 2:4.2.2+dfsg-3 (using .../libgmp3c2_2%3a4.2.4+dfsg-2_amd64.deb) ...
-Unpacking replacement libgmp3c2 ...
-Preparing to replace libmpfr1ldbl 2.3.2.dfsg.1-1 (using .../libmpfr1ldbl_2.4.0-5_amd64.deb) ...
-Unpacking replacement libmpfr1ldbl ...
-Preparing to replace libc6 2.7-18 (using .../archives/libc6_2.9-3_amd64.deb) ...
-Checking for services that may need to be restarted...
-Checking init scripts...
-Unpacking replacement libc6 ...
-Setting up libc6 (2.9-3) ...
-Installing new version of config file /etc/gai.conf ...
-Installing new version of config file /etc/init.d/glibc.sh ...
-(Reading database ... 9764 files and directories currently installed.)
-Preparing to replace libncurses5 5.7+20081213-1 (using .../libncurses5_5.7+20090214-1_amd64.deb) ...
-Unpacking replacement libncurses5 ...
-Setting up libncurses5 (5.7+20090214-1) ...
-(Reading database ... 9764 files and directories currently installed.)
-Preparing to replace ncurses-base 5.7+20081213-1 (using .../ncurses-base_5.7+20090214-1_all.deb) ...
-Unpacking replacement ncurses-base ...
-Setting up ncurses-base (5.7+20090214-1) ...
-(Reading database ... 9764 files and directories currently installed.)
-Preparing to replace debconf-i18n 1.5.24 (using .../debconf-i18n_1.5.25_all.deb) ...
-Unpacking replacement debconf-i18n ...
-Setting up debconf-i18n (1.5.25) ...
-(Reading database ... 9764 files and directories currently installed.)
-Preparing to replace debconf 1.5.24 (using .../debconf_1.5.25_all.deb) ...
-Unpacking replacement debconf ...
-Setting up debconf (1.5.25) ...
-(Reading database ... 9764 files and directories currently installed.)
-Preparing to replace gpgv 1.4.9-3 (using .../gpgv_1.4.9-4_amd64.deb) ...
-Unpacking replacement gpgv ...
-Setting up gpgv (1.4.9-4) ...
-(Reading database ... 9764 files and directories currently installed.)
-Preparing to replace gnupg 1.4.9-3 (using .../gnupg_1.4.9-4_amd64.deb) ...
-Unpacking replacement gnupg ...
-Setting up gnupg (1.4.9-4) ...
-(Reading database ... 9766 files and directories currently installed.)
-Preparing to replace libselinux1 2.0.65-5 (using .../libselinux1_2.0.71-1_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (2.0.71-1) ...
-init: timeout opening/writing control channel /dev/initctl
-(Reading database ... 9766 files and directories currently installed.)
-Preparing to replace cpio 2.9-15 (using .../cpio_2.9.90-2_amd64.deb) ...
-Unpacking replacement cpio ...
-Preparing to replace libncursesw5 5.7+20081213-1 (using .../libncursesw5_5.7+20090214-1_amd64.deb) ...
-Unpacking replacement libncursesw5 ...
-Preparing to replace libxapian15 1.0.7-4 (using .../libxapian15_1.0.10-2_amd64.deb) ...
-Unpacking replacement libxapian15 ...
-Preparing to replace libdevmapper1.02.1 2:1.02.27-4 (using .../libdevmapper1.02.1_2%3a1.02.30-1_amd64.deb) ...
-Unpacking replacement libdevmapper1.02.1 ...
-Preparing to replace cpp 4:4.3.2-2 (using .../cpp_4%3a4.3.2-3_amd64.deb) ...
-Unpacking replacement cpp ...
-Preparing to replace gcc 4:4.3.2-2 (using .../gcc_4%3a4.3.2-3_amd64.deb) ...
-Removing old gcc doc directory.
-Unpacking replacement gcc ...
-Preparing to replace g++ 4:4.3.2-2 (using .../g++_4%3a4.3.2-3_amd64.deb) ...
-Unpacking replacement g++ ...
-Setting up linux-libc-dev (2.6.28-1) ...
-Setting up libc6-dev (2.9-3) ...
-Setting up libgomp1 (4.3.3-4) ...
-Setting up libgmp3c2 (2:4.2.4+dfsg-2) ...
-Setting up libmpfr1ldbl (2.4.0-5) ...
-Setting up cpp-4.3 (4.3.3-4) ...
-Setting up gcc-4.3 (4.3.3-4) ...
-Setting up cpio (2.9.90-2) ...
-Setting up libncursesw5 (5.7+20090214-1) ...
-Setting up libxapian15 (1.0.10-2) ...
-Setting up libdevmapper1.02.1 (2:1.02.30-1) ...
-Setting up cpp (4:4.3.2-3) ...
-Setting up gcc (4:4.3.2-3) ...
-Setting up g++-4.3 (4.3.3-4) ...
-Setting up g++ (4:4.3.2-3) ...
-Setting up libstdc++6-4.3-dev (4.3.3-4) ...
+(READING DATABASE ... 9700 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE COREUTILS 6.10-6 (USING .../COREUTILS_7.1-2_AMD64.DEB) ...
+UNPACKING REPLACEMENT COREUTILS ...
+SETTING UP COREUTILS (7.1-2) ...
+(READING DATABASE ... 9705 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE NCURSES-BIN 5.7+20090228-1 (USING .../NCURSES-BIN_5.7+20090314-1_AMD64.DEB) ...
+UNPACKING REPLACEMENT NCURSES-BIN ...
+SETTING UP NCURSES-BIN (5.7+20090314-1) ...
+(READING DATABASE ... 9705 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE LINUX-LIBC-DEV 2.6.26-13 (USING .../LINUX-LIBC-DEV_2.6.28-1_AMD64.DEB) ...
+UNPACKING REPLACEMENT LINUX-LIBC-DEV ...
+PREPARING TO REPLACE LIBC6-DEV 2.9-4 (USING .../LIBC6-DEV_2.9-6_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBC6-DEV ...
+PREPARING TO REPLACE LIBGOMP1 4.3.3-3 (USING .../LIBGOMP1_4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBGOMP1 ...
+PREPARING TO REPLACE CPP-4.3 4.3.3-3 (USING .../CPP-4.3_4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT CPP-4.3 ...
+PREPARING TO REPLACE GCC-4.3-BASE 4.3.3-3 (USING .../GCC-4.3-BASE_4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT GCC-4.3-BASE ...
+SETTING UP GCC-4.3-BASE (4.3.3-5) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE LIBGCC1 1:4.3.3-3 (USING .../LIBGCC1_1%3A4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBGCC1 ...
+SETTING UP LIBGCC1 (1:4.3.3-5) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE GCC-4.3 4.3.3-3 (USING .../GCC-4.3_4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT GCC-4.3 ...
+PREPARING TO REPLACE G++-4.3 4.3.3-3 (USING .../G++-4.3_4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT G++-4.3 ...
+PREPARING TO REPLACE LIBSTDC++6-4.3-DEV 4.3.3-3 (USING .../LIBSTDC++6-4.3-DEV_4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBSTDC++6-4.3-DEV ...
+PREPARING TO REPLACE LIBSTDC++6 4.3.3-3 (USING .../LIBSTDC++6_4.3.3-5_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBSTDC++6 ...
+SETTING UP LIBSTDC++6 (4.3.3-5) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE LIBC6 2.9-4 (USING .../ARCHIVES/LIBC6_2.9-6_AMD64.DEB) ...
+CHECKING FOR SERVICES THAT MAY NEED TO BE RESTARTED...
+CHECKING INIT SCRIPTS...
+UNPACKING REPLACEMENT LIBC6 ...
+SETTING UP LIBC6 (2.9-6) ...
+INSTALLING NEW VERSION OF CONFIG FILE /ETC/INIT.D/GLIBC.SH ...
+CHECKING FOR SERVICES THAT MAY NEED TO BE RESTARTED...
+CHECKING INIT SCRIPTS...
+NOTHING TO RESTART.
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE BASE-PASSWD 3.5.20 (USING .../BASE-PASSWD_3.5.21_AMD64.DEB) ...
+UNPACKING REPLACEMENT BASE-PASSWD ...
+SETTING UP BASE-PASSWD (3.5.21) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE LIBNCURSES5 5.7+20090228-1 (USING .../LIBNCURSES5_5.7+20090314-1_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBNCURSES5 ...
+SETTING UP LIBNCURSES5 (5.7+20090314-1) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE NCURSES-BASE 5.7+20090228-1 (USING .../NCURSES-BASE_5.7+20090314-1_ALL.DEB) ...
+UNPACKING REPLACEMENT NCURSES-BASE ...
+SETTING UP NCURSES-BASE (5.7+20090314-1) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE LIBSELINUX1 2.0.65-5 (USING .../LIBSELINUX1_2.0.71-1_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBSELINUX1 ...
+SETTING UP LIBSELINUX1 (2.0.71-1) ...
+INIT: TIMEOUT OPENING/WRITING CONTROL CHANNEL /DEV/INITCTL
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE LSB-BASE 3.2-20 (USING .../LSB-BASE_3.2-22_ALL.DEB) ...
+UNPACKING REPLACEMENT LSB-BASE ...
+SETTING UP LSB-BASE (3.2-22) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE TZDATA 2009B-1 (USING .../TZDATA_2009C-1_ALL.DEB) ...
+UNPACKING REPLACEMENT TZDATA ...
+SETTING UP TZDATA (2009C-1) ...
+
+CURRENT DEFAULT TIMEZONE: 'ETC/UTC'
+LOCAL TIME IS NOW:      SAT MAR 21 03:03:09 UTC 2009.
+UNIVERSAL TIME IS NOW:  SAT MAR 21 03:03:09 UTC 2009.
+RUN 'DPKG-RECONFIGURE TZDATA' IF YOU WISH TO CHANGE IT.
+
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE ZLIB1G 1:1.2.3.3.DFSG-12 (USING .../ZLIB1G_1%3A1.2.3.3.DFSG-13_AMD64.DEB) ...
+UNPACKING REPLACEMENT ZLIB1G ...
+SETTING UP ZLIB1G (1:1.2.3.3.DFSG-13) ...
+(READING DATABASE ... 9779 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+PREPARING TO REPLACE LIBNCURSESW5 5.7+20090228-1 (USING .../LIBNCURSESW5_5.7+20090314-1_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBNCURSESW5 ...
+PREPARING TO REPLACE LIBDEVMAPPER1.02.1 2:1.02.27-4 (USING .../LIBDEVMAPPER1.02.1_2%3A1.02.30-3_AMD64.DEB) ...
+UNPACKING REPLACEMENT LIBDEVMAPPER1.02.1 ...
+SETTING UP LINUX-LIBC-DEV (2.6.28-1) ...
+SETTING UP LIBC6-DEV (2.9-6) ...
+SETTING UP LIBGOMP1 (4.3.3-5) ...
+SETTING UP CPP-4.3 (4.3.3-5) ...
+SETTING UP GCC-4.3 (4.3.3-5) ...
+SETTING UP LIBNCURSESW5 (5.7+20090314-1) ...
+SETTING UP LIBDEVMAPPER1.02.1 (2:1.02.30-3) ...
+SETTING UP G++-4.3 (4.3.3-5) ...
+SETTING UP LIBSTDC++6-4.3-DEV (4.3.3-5) ...
 Reading package lists...
 Building dependency tree...
 Reading state information...
diff --git a/testsuite/normal/pdebuild-internal-lenny.log b/testsuite/normal/pdebuild-internal-lenny.log
index 1ea011d..795fcb0 100644
--- a/testsuite/normal/pdebuild-internal-lenny.log
+++ b/testsuite/normal/pdebuild-internal-lenny.log
@@ -115,60 +115,60 @@ Get:16 http://localhost lenny/main sp 1.3.4-1.2.1-47 [182kB]
 Get:17 http://localhost lenny/main po4a 0.34-2 [847kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
-SELECTING PREVIOUSLY DESELECTED PACKAGE LIBMAGIC1.
-(READING DATABASE ... 9847 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
-UNPACKING LIBMAGIC1 (FROM .../LIBMAGIC1_4.26-1_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE FILE.
-UNPACKING FILE (FROM .../ARCHIVES/FILE_4.26-1_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE HTML2TEXT.
-UNPACKING HTML2TEXT (FROM .../HTML2TEXT_1.3.2A-5_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE GETTEXT-BASE.
-UNPACKING GETTEXT-BASE (FROM .../GETTEXT-BASE_0.17-4_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE GETTEXT.
-UNPACKING GETTEXT (FROM .../GETTEXT_0.17-4_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE INTLTOOL-DEBIAN.
-UNPACKING INTLTOOL-DEBIAN (FROM .../INTLTOOL-DEBIAN_0.35.0+20060710.1_ALL.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE PO-DEBCONF.
-UNPACKING PO-DEBCONF (FROM .../PO-DEBCONF_1.0.15_ALL.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE GROFF-BASE.
-UNPACKING GROFF-BASE (FROM .../GROFF-BASE_1.18.1.1-21_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE BSDMAINUTILS.
-UNPACKING BSDMAINUTILS (FROM .../BSDMAINUTILS_6.1.10_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE MAN-DB.
-UNPACKING MAN-DB (FROM .../MAN-DB_2.5.2-4_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE DEBHELPER.
-UNPACKING DEBHELPER (FROM .../DEBHELPER_7.0.15_ALL.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE LIBDSHCONFIG1.
-UNPACKING LIBDSHCONFIG1 (FROM .../LIBDSHCONFIG1_0.20.13-1_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE LIBDSHCONFIG1-DEV.
-UNPACKING LIBDSHCONFIG1-DEV (FROM .../LIBDSHCONFIG1-DEV_0.20.13-1_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE LIBSGMLS-PERL.
-UNPACKING LIBSGMLS-PERL (FROM .../LIBSGMLS-PERL_1.03II-32_ALL.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE LIBSP1C2.
-UNPACKING LIBSP1C2 (FROM .../LIBSP1C2_1.3.4-1.2.1-47_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE SP.
-UNPACKING SP (FROM .../SP_1.3.4-1.2.1-47_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE PO4A.
-UNPACKING PO4A (FROM .../ARCHIVES/PO4A_0.34-2_ALL.DEB) ...
-SETTING UP LIBMAGIC1 (4.26-1) ...
-SETTING UP FILE (4.26-1) ...
-SETTING UP HTML2TEXT (1.3.2A-5) ...
-SETTING UP GETTEXT-BASE (0.17-4) ...
-SETTING UP GETTEXT (0.17-4) ...
-SETTING UP INTLTOOL-DEBIAN (0.35.0+20060710.1) ...
-SETTING UP PO-DEBCONF (1.0.15) ...
-SETTING UP GROFF-BASE (1.18.1.1-21) ...
-SETTING UP BSDMAINUTILS (6.1.10) ...
-SETTING UP MAN-DB (2.5.2-4) ...
-BUILDING DATABASE OF MANUAL PAGES ...
-SETTING UP DEBHELPER (7.0.15) ...
-SETTING UP LIBDSHCONFIG1 (0.20.13-1) ...
-SETTING UP LIBDSHCONFIG1-DEV (0.20.13-1) ...
-SETTING UP LIBSGMLS-PERL (1.03II-32) ...
-SETTING UP LIBSP1C2 (1.3.4-1.2.1-47) ...
-SETTING UP SP (1.3.4-1.2.1-47) ...
-SETTING UP PO4A (0.34-2) ...
-SETTING UP PBUILDER-SATISFYDEPENDS-DUMMY (0.INVALID.0) ...
+Selecting previously deselected package libmagic1.
+(Reading database ... 9847 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.26-1_amd64.deb) ...
+Selecting previously deselected package file.
+Unpacking file (from .../archives/file_4.26-1_amd64.deb) ...
+Selecting previously deselected package html2text.
+Unpacking html2text (from .../html2text_1.3.2a-5_amd64.deb) ...
+Selecting previously deselected package gettext-base.
+Unpacking gettext-base (from .../gettext-base_0.17-4_amd64.deb) ...
+Selecting previously deselected package gettext.
+Unpacking gettext (from .../gettext_0.17-4_amd64.deb) ...
+Selecting previously deselected package intltool-debian.
+Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) ...
+Selecting previously deselected package po-debconf.
+Unpacking po-debconf (from .../po-debconf_1.0.15_all.deb) ...
+Selecting previously deselected package groff-base.
+Unpacking groff-base (from .../groff-base_1.18.1.1-21_amd64.deb) ...
+Selecting previously deselected package bsdmainutils.
+Unpacking bsdmainutils (from .../bsdmainutils_6.1.10_amd64.deb) ...
+Selecting previously deselected package man-db.
+Unpacking man-db (from .../man-db_2.5.2-4_amd64.deb) ...
+Selecting previously deselected package debhelper.
+Unpacking debhelper (from .../debhelper_7.0.15_all.deb) ...
+Selecting previously deselected package libdshconfig1.
+Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_amd64.deb) ...
+Selecting previously deselected package libdshconfig1-dev.
+Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.13-1_amd64.deb) ...
+Selecting previously deselected package libsgmls-perl.
+Unpacking libsgmls-perl (from .../libsgmls-perl_1.03ii-32_all.deb) ...
+Selecting previously deselected package libsp1c2.
+Unpacking libsp1c2 (from .../libsp1c2_1.3.4-1.2.1-47_amd64.deb) ...
+Selecting previously deselected package sp.
+Unpacking sp (from .../sp_1.3.4-1.2.1-47_amd64.deb) ...
+Selecting previously deselected package po4a.
+Unpacking po4a (from .../archives/po4a_0.34-2_all.deb) ...
+Setting up libmagic1 (4.26-1) ...
+Setting up file (4.26-1) ...
+Setting up html2text (1.3.2a-5) ...
+Setting up gettext-base (0.17-4) ...
+Setting up gettext (0.17-4) ...
+Setting up intltool-debian (0.35.0+20060710.1) ...
+Setting up po-debconf (1.0.15) ...
+Setting up groff-base (1.18.1.1-21) ...
+Setting up bsdmainutils (6.1.10) ...
+Setting up man-db (2.5.2-4) ...
+Building database of manual pages ...
+Setting up debhelper (7.0.15) ...
+Setting up libdshconfig1 (0.20.13-1) ...
+Setting up libdshconfig1-dev (0.20.13-1) ...
+Setting up libsgmls-perl (1.03ii-32) ...
+Setting up libsp1c2 (1.3.4-1.2.1-47) ...
+Setting up sp (1.3.4-1.2.1-47) ...
+Setting up po4a (0.34-2) ...
+Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ...
 Reading package lists...
 Building dependency tree...
 Reading state information...
@@ -499,11 +499,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
-Thu Feb 26 04:47:31 UTC 2009
+Sat Mar 21 02:27:02 UTC 2009
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -573,14 +573,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
-Thu Feb 26 04:47:36 UTC 2009
+Sat Mar 21 02:27:07 UTC 2009
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 b: b
 a: a
-dsh: Process terminated (before write).
 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-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index 0af4dea..459049e 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -33,7 +33,7 @@ Get:6 http://localhost sid/main pbuilder 0.186 [329kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libssl0.9.8.
-(Reading database ... 9767 files and directories currently installed.)
+(Reading database ... 9780 files and directories currently installed.)
 Unpacking libssl0.9.8 (from .../libssl0.9.8_0.9.8g-15_amd64.deb) ...
 Selecting previously deselected package wget.
 Unpacking wget (from .../wget_1.11.4-2_amd64.deb) ...
@@ -68,7 +68,7 @@ Reading state information...
 aptitude is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Selecting previously deselected package pbuilder-satisfydepends-dummy.
-(Reading database ... 9960 files and directories currently installed.)
+(Reading database ... 9973 files and directories currently installed.)
 Unpacking pbuilder-satisfydepends-dummy (from .../pbuilder-satisfydepends-dummy.deb) ...
 dpkg: dependency problems prevent configuration of pbuilder-satisfydepends-dummy:
  pbuilder-satisfydepends-dummy depends on debhelper (>> 3.0.0); however:
@@ -95,33 +95,33 @@ The following NEW packages will be installed:
 The following partially installed packages will be configured:
   pbuilder-satisfydepends-dummy 
 0 packages upgraded, 21 newly installed, 0 to remove and 0 not upgraded.
-Need to get 11.2MB of archives. After unpacking 33.1MB will be used.
+Need to get 11.2MB of archives. After unpacking 33.2MB will be used.
 Writing extended state information...
 Get:1 http://localhost sid/main libmagic1 4.26-2 [369kB]
 Get:2 http://localhost sid/main file 4.26-2 [44.8kB]
 Get:3 http://localhost sid/main html2text 1.3.2a-13 [103kB]
 Get:4 http://localhost sid/main libpcre3 7.8-2 [215kB]
-Get:5 http://localhost sid/main libglib2.0-0 2.18.4-2 [844kB]
-Get:6 http://localhost sid/main libxml2 2.6.32.dfsg-5 [860kB]
+Get:5 http://localhost sid/main libglib2.0-0 2.20.0-2 [845kB]
+Get:6 http://localhost sid/main libxml2 2.7.3.dfsg-1 [870kB]
 Get:7 http://localhost sid/main libcroco3 0.6.1-2 [123kB]
 Get:8 http://localhost sid/main gettext-base 0.17-6 [125kB]
 Get:9 http://localhost sid/main gettext 0.17-6 [2710kB]
 Get:10 http://localhost sid/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:11 http://localhost sid/main po-debconf 1.0.15 [237kB]
-Get:12 http://localhost sid/main groff-base 1.18.1.1-21 [898kB]
+Get:12 http://localhost sid/main groff-base 1.18.1.1-22 [897kB]
 Get:13 http://localhost sid/main bsdmainutils 6.1.10 [179kB]
-Get:14 http://localhost sid/main man-db 2.5.4-1 [1386kB]
-Get:15 http://localhost sid/main debhelper 7.0.17 [554kB]
+Get:14 http://localhost sid/main man-db 2.5.5-1 [1387kB]
+Get:15 http://localhost sid/main debhelper 7.2.6 [550kB]
 Get:16 http://localhost sid/main libdshconfig1 0.20.13-1 [11.0kB]
 Get:17 http://localhost sid/main libdshconfig1-dev 0.20.13-1 [25.4kB]
 Get:18 http://localhost sid/main libsgmls-perl 1.03ii-32 [27.8kB]
 Get:19 http://localhost sid/main libsp1c2 1.3.4-1.2.1-47 [1386kB]
 Get:20 http://localhost sid/main sp 1.3.4-1.2.1-47 [182kB]
-Get:21 http://localhost sid/main po4a 0.34-2 [847kB]
+Get:21 http://localhost sid/main po4a 0.36-2 [870kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 9960 files and directories currently installed.)
+(Reading database ... 9973 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.26-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.26-2_amd64.deb) ...
@@ -130,9 +130,9 @@ Unpacking html2text (from .../html2text_1.3.2a-13_amd64.deb) ...
 Selecting previously deselected package libpcre3.
 Unpacking libpcre3 (from .../libpcre3_7.8-2_amd64.deb) ...
 Selecting previously deselected package libglib2.0-0.
-Unpacking libglib2.0-0 (from .../libglib2.0-0_2.18.4-2_amd64.deb) ...
+Unpacking libglib2.0-0 (from .../libglib2.0-0_2.20.0-2_amd64.deb) ...
 Selecting previously deselected package libxml2.
-Unpacking libxml2 (from .../libxml2_2.6.32.dfsg-5_amd64.deb) ...
+Unpacking libxml2 (from .../libxml2_2.7.3.dfsg-1_amd64.deb) ...
 Selecting previously deselected package libcroco3.
 Unpacking libcroco3 (from .../libcroco3_0.6.1-2_amd64.deb) ...
 Selecting previously deselected package gettext-base.
@@ -144,13 +144,13 @@ Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) .
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_1.0.15_all.deb) ...
 Selecting previously deselected package groff-base.
-Unpacking groff-base (from .../groff-base_1.18.1.1-21_amd64.deb) ...
+Unpacking groff-base (from .../groff-base_1.18.1.1-22_amd64.deb) ...
 Selecting previously deselected package bsdmainutils.
 Unpacking bsdmainutils (from .../bsdmainutils_6.1.10_amd64.deb) ...
 Selecting previously deselected package man-db.
-Unpacking man-db (from .../man-db_2.5.4-1_amd64.deb) ...
+Unpacking man-db (from .../man-db_2.5.5-1_amd64.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_7.0.17_all.deb) ...
+Unpacking debhelper (from .../debhelper_7.2.6_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -162,29 +162,29 @@ Unpacking libsp1c2 (from .../libsp1c2_1.3.4-1.2.1-47_amd64.deb) ...
 Selecting previously deselected package sp.
 Unpacking sp (from .../sp_1.3.4-1.2.1-47_amd64.deb) ...
 Selecting previously deselected package po4a.
-Unpacking po4a (from .../archives/po4a_0.34-2_all.deb) ...
+Unpacking po4a (from .../archives/po4a_0.36-2_all.deb) ...
 Setting up libmagic1 (4.26-2) ...
 Setting up file (4.26-2) ...
 Setting up html2text (1.3.2a-13) ...
 Setting up libpcre3 (7.8-2) ...
-Setting up libglib2.0-0 (2.18.4-2) ...
-Setting up libxml2 (2.6.32.dfsg-5) ...
+Setting up libglib2.0-0 (2.20.0-2) ...
+Setting up libxml2 (2.7.3.dfsg-1) ...
 Setting up libcroco3 (0.6.1-2) ...
 Setting up gettext-base (0.17-6) ...
 Setting up gettext (0.17-6) ...
 Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.15) ...
-Setting up groff-base (1.18.1.1-21) ...
+Setting up groff-base (1.18.1.1-22) ...
 Setting up bsdmainutils (6.1.10) ...
-Setting up man-db (2.5.4-1) ...
+Setting up man-db (2.5.5-1) ...
 Building database of manual pages ...
-Setting up debhelper (7.0.17) ...
+Setting up debhelper (7.2.6) ...
 Setting up libdshconfig1 (0.20.13-1) ...
 Setting up libdshconfig1-dev (0.20.13-1) ...
 Setting up libsgmls-perl (1.03ii-32) ...
 Setting up libsp1c2 (1.3.4-1.2.1-47) ...
 Setting up sp (1.3.4-1.2.1-47) ...
-Setting up po4a (0.34-2) ...
+Setting up po4a (0.36-2) ...
 Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ...
 Reading package lists...
 Building dependency tree...
@@ -199,16 +199,16 @@ Reading state information...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 116kB of archives.
+Need to get 117kB of archives.
 After this operation, 467kB of additional disk space will be used.
-Get:1 http://localhost sid/main fakeroot 1.12.1 [116kB]
+Get:1 http://localhost sid/main fakeroot 1.12.2 [117kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11506 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.12.1_amd64.deb) ...
+(Reading database ... 11520 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.12.2_amd64.deb) ...
 Processing triggers for man-db ...
-Setting up fakeroot (1.12.1) ...
+Setting up fakeroot (1.12.2) ...
 dpkg-buildpackage: set CFLAGS to default value: -g -O2
 dpkg-buildpackage: set CPPFLAGS to default value: 
 dpkg-buildpackage: set LDFLAGS to default value: 
@@ -505,10 +505,10 @@ success
 success
 success
 success
-d: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -520,7 +520,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
-Thu Feb 26 04:40:43 UTC 2009
+Sat Mar 21 02:20:01 UTC 2009
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -590,7 +590,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
-Thu Feb 26 04:40:48 UTC 2009
+Sat Mar 21 02:20:06 UTC 2009
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/normal/pdebuild-internal-squeeze.log b/testsuite/normal/pdebuild-internal-squeeze.log
index 6b52ea4..b78b459 100644
--- a/testsuite/normal/pdebuild-internal-squeeze.log
+++ b/testsuite/normal/pdebuild-internal-squeeze.log
@@ -22,18 +22,18 @@ The following NEW packages will be installed:
   cdebootstrap libdebian-installer-extra4 libdebian-installer4 libssl0.9.8
   pbuilder wget
 0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded.
-Need to get 1997kB of archives.
-After this operation, 5882kB of additional disk space will be used.
+Need to get 1994kB of archives.
+After this operation, 5874kB of additional disk space will be used.
 Get:1 http://localhost squeeze/main libssl0.9.8 0.9.8g-15 [975kB]
 Get:2 http://localhost squeeze/main wget 1.11.4-2 [616kB]
 Get:3 http://localhost squeeze/main libdebian-installer4 0.61 [30.1kB]
 Get:4 http://localhost squeeze/main libdebian-installer-extra4 0.61 [11.6kB]
 Get:5 http://localhost squeeze/main cdebootstrap 0.5.4 [32.3kB]
-Get:6 http://localhost squeeze/main pbuilder 0.185 [332kB]
+Get:6 http://localhost squeeze/main pbuilder 0.186 [329kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libssl0.9.8.
-(Reading database ... 9677 files and directories currently installed.)
+(Reading database ... 9700 files and directories currently installed.)
 Unpacking libssl0.9.8 (from .../libssl0.9.8_0.9.8g-15_amd64.deb) ...
 Selecting previously deselected package wget.
 Unpacking wget (from .../wget_1.11.4-2_amd64.deb) ...
@@ -44,13 +44,13 @@ Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.61_a
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.5.4_amd64.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.185_all.deb) ...
+Unpacking pbuilder (from .../pbuilder_0.186_all.deb) ...
 Setting up libssl0.9.8 (0.9.8g-15) ...
 Setting up wget (1.11.4-2) ...
 Setting up libdebian-installer4 (0.61) ...
 Setting up libdebian-installer-extra4 (0.61) ...
 Setting up cdebootstrap (0.5.4) ...
-Setting up pbuilder (0.185) ...
+Setting up pbuilder (0.186) ...
 I: Setting DEBBUILDOPTS=
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
@@ -68,7 +68,7 @@ Reading state information...
 aptitude is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Selecting previously deselected package pbuilder-satisfydepends-dummy.
-(Reading database ... 9869 files and directories currently installed.)
+(Reading database ... 9893 files and directories currently installed.)
 Unpacking pbuilder-satisfydepends-dummy (from .../pbuilder-satisfydepends-dummy.deb) ...
 dpkg: dependency problems prevent configuration of pbuilder-satisfydepends-dummy:
  pbuilder-satisfydepends-dummy depends on debhelper (>> 3.0.0); however:
@@ -95,14 +95,14 @@ The following NEW packages will be installed:
 The following partially installed packages will be configured:
   pbuilder-satisfydepends-dummy 
 0 packages upgraded, 21 newly installed, 0 to remove and 0 not upgraded.
-Need to get 10.9MB of archives. After unpacking 32.5MB will be used.
+Need to get 11.2MB of archives. After unpacking 33.1MB will be used.
 Writing extended state information...
 Get:1 http://localhost squeeze/main libmagic1 4.26-2 [369kB]
 Get:2 http://localhost squeeze/main file 4.26-2 [44.8kB]
-Get:3 http://localhost squeeze/main html2text 1.3.2a-5 [95.9kB]
+Get:3 http://localhost squeeze/main html2text 1.3.2a-13 [103kB]
 Get:4 http://localhost squeeze/main libpcre3 7.8-2 [215kB]
-Get:5 http://localhost squeeze/main libglib2.0-0 2.16.6-1 [826kB]
-Get:6 http://localhost squeeze/main libxml2 2.6.32.dfsg-5 [860kB]
+Get:5 http://localhost squeeze/main libglib2.0-0 2.18.4-2 [844kB]
+Get:6 http://localhost squeeze/main libxml2 2.7.3.dfsg-1 [870kB]
 Get:7 http://localhost squeeze/main libcroco3 0.6.1-2 [123kB]
 Get:8 http://localhost squeeze/main gettext-base 0.17-6 [125kB]
 Get:9 http://localhost squeeze/main gettext 0.17-6 [2710kB]
@@ -110,7 +110,7 @@ Get:10 http://localhost squeeze/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:11 http://localhost squeeze/main po-debconf 1.0.15 [237kB]
 Get:12 http://localhost squeeze/main groff-base 1.18.1.1-21 [898kB]
 Get:13 http://localhost squeeze/main bsdmainutils 6.1.10 [179kB]
-Get:14 http://localhost squeeze/main man-db 2.5.2-4 [1107kB]
+Get:14 http://localhost squeeze/main man-db 2.5.4-1 [1386kB]
 Get:15 http://localhost squeeze/main debhelper 7.0.17 [554kB]
 Get:16 http://localhost squeeze/main libdshconfig1 0.20.13-1 [11.0kB]
 Get:17 http://localhost squeeze/main libdshconfig1-dev 0.20.13-1 [25.4kB]
@@ -120,72 +120,72 @@ Get:20 http://localhost squeeze/main sp 1.3.4-1.2.1-47 [182kB]
 Get:21 http://localhost squeeze/main po4a 0.34-2 [847kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
-Selecting previously deselected package libmagic1.
-(Reading database ... 9869 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.26-2_amd64.deb) ...
-Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.26-2_amd64.deb) ...
-Selecting previously deselected package html2text.
-Unpacking html2text (from .../html2text_1.3.2a-5_amd64.deb) ...
-Selecting previously deselected package libpcre3.
-Unpacking libpcre3 (from .../libpcre3_7.8-2_amd64.deb) ...
-Selecting previously deselected package libglib2.0-0.
-Unpacking libglib2.0-0 (from .../libglib2.0-0_2.16.6-1_amd64.deb) ...
-Selecting previously deselected package libxml2.
-Unpacking libxml2 (from .../libxml2_2.6.32.dfsg-5_amd64.deb) ...
-Selecting previously deselected package libcroco3.
-Unpacking libcroco3 (from .../libcroco3_0.6.1-2_amd64.deb) ...
-Selecting previously deselected package gettext-base.
-Unpacking gettext-base (from .../gettext-base_0.17-6_amd64.deb) ...
-Selecting previously deselected package gettext.
-Unpacking gettext (from .../gettext_0.17-6_amd64.deb) ...
-Selecting previously deselected package intltool-debian.
-Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) ...
-Selecting previously deselected package po-debconf.
-Unpacking po-debconf (from .../po-debconf_1.0.15_all.deb) ...
-Selecting previously deselected package groff-base.
-Unpacking groff-base (from .../groff-base_1.18.1.1-21_amd64.deb) ...
-Selecting previously deselected package bsdmainutils.
-Unpacking bsdmainutils (from .../bsdmainutils_6.1.10_amd64.deb) ...
-Selecting previously deselected package man-db.
-Unpacking man-db (from .../man-db_2.5.2-4_amd64.deb) ...
-Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_7.0.17_all.deb) ...
-Selecting previously deselected package libdshconfig1.
-Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_amd64.deb) ...
-Selecting previously deselected package libdshconfig1-dev.
-Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.13-1_amd64.deb) ...
-Selecting previously deselected package libsgmls-perl.
-Unpacking libsgmls-perl (from .../libsgmls-perl_1.03ii-32_all.deb) ...
-Selecting previously deselected package libsp1c2.
-Unpacking libsp1c2 (from .../libsp1c2_1.3.4-1.2.1-47_amd64.deb) ...
-Selecting previously deselected package sp.
-Unpacking sp (from .../sp_1.3.4-1.2.1-47_amd64.deb) ...
-Selecting previously deselected package po4a.
-Unpacking po4a (from .../archives/po4a_0.34-2_all.deb) ...
-Setting up libmagic1 (4.26-2) ...
-Setting up file (4.26-2) ...
-Setting up html2text (1.3.2a-5) ...
-Setting up libpcre3 (7.8-2) ...
-Setting up libglib2.0-0 (2.16.6-1) ...
-Setting up libxml2 (2.6.32.dfsg-5) ...
-Setting up libcroco3 (0.6.1-2) ...
-Setting up gettext-base (0.17-6) ...
-Setting up gettext (0.17-6) ...
-Setting up intltool-debian (0.35.0+20060710.1) ...
-Setting up po-debconf (1.0.15) ...
-Setting up groff-base (1.18.1.1-21) ...
-Setting up bsdmainutils (6.1.10) ...
-Setting up man-db (2.5.2-4) ...
-Building database of manual pages ...
-Setting up debhelper (7.0.17) ...
-Setting up libdshconfig1 (0.20.13-1) ...
-Setting up libdshconfig1-dev (0.20.13-1) ...
-Setting up libsgmls-perl (1.03ii-32) ...
-Setting up libsp1c2 (1.3.4-1.2.1-47) ...
-Setting up sp (1.3.4-1.2.1-47) ...
-Setting up po4a (0.34-2) ...
-Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE LIBMAGIC1.
+(READING DATABASE ... 9893 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
+UNPACKING LIBMAGIC1 (FROM .../LIBMAGIC1_4.26-2_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE FILE.
+UNPACKING FILE (FROM .../ARCHIVES/FILE_4.26-2_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE HTML2TEXT.
+UNPACKING HTML2TEXT (FROM .../HTML2TEXT_1.3.2A-13_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE LIBPCRE3.
+UNPACKING LIBPCRE3 (FROM .../LIBPCRE3_7.8-2_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE LIBGLIB2.0-0.
+UNPACKING LIBGLIB2.0-0 (FROM .../LIBGLIB2.0-0_2.18.4-2_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE LIBXML2.
+UNPACKING LIBXML2 (FROM .../LIBXML2_2.7.3.DFSG-1_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE LIBCROCO3.
+UNPACKING LIBCROCO3 (FROM .../LIBCROCO3_0.6.1-2_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE GETTEXT-BASE.
+UNPACKING GETTEXT-BASE (FROM .../GETTEXT-BASE_0.17-6_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE GETTEXT.
+UNPACKING GETTEXT (FROM .../GETTEXT_0.17-6_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE INTLTOOL-DEBIAN.
+UNPACKING INTLTOOL-DEBIAN (FROM .../INTLTOOL-DEBIAN_0.35.0+20060710.1_ALL.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE PO-DEBCONF.
+UNPACKING PO-DEBCONF (FROM .../PO-DEBCONF_1.0.15_ALL.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE GROFF-BASE.
+UNPACKING GROFF-BASE (FROM .../GROFF-BASE_1.18.1.1-21_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE BSDMAINUTILS.
+UNPACKING BSDMAINUTILS (FROM .../BSDMAINUTILS_6.1.10_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE MAN-DB.
+UNPACKING MAN-DB (FROM .../MAN-DB_2.5.4-1_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE DEBHELPER.
+UNPACKING DEBHELPER (FROM .../DEBHELPER_7.0.17_ALL.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE LIBDSHCONFIG1.
+UNPACKING LIBDSHCONFIG1 (FROM .../LIBDSHCONFIG1_0.20.13-1_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE LIBDSHCONFIG1-DEV.
+UNPACKING LIBDSHCONFIG1-DEV (FROM .../LIBDSHCONFIG1-DEV_0.20.13-1_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE LIBSGMLS-PERL.
+UNPACKING LIBSGMLS-PERL (FROM .../LIBSGMLS-PERL_1.03II-32_ALL.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE LIBSP1C2.
+UNPACKING LIBSP1C2 (FROM .../LIBSP1C2_1.3.4-1.2.1-47_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE SP.
+UNPACKING SP (FROM .../SP_1.3.4-1.2.1-47_AMD64.DEB) ...
+SELECTING PREVIOUSLY DESELECTED PACKAGE PO4A.
+UNPACKING PO4A (FROM .../ARCHIVES/PO4A_0.34-2_ALL.DEB) ...
+SETTING UP LIBMAGIC1 (4.26-2) ...
+SETTING UP FILE (4.26-2) ...
+SETTING UP HTML2TEXT (1.3.2A-13) ...
+SETTING UP LIBPCRE3 (7.8-2) ...
+SETTING UP LIBGLIB2.0-0 (2.18.4-2) ...
+SETTING UP LIBXML2 (2.7.3.DFSG-1) ...
+SETTING UP LIBCROCO3 (0.6.1-2) ...
+SETTING UP GETTEXT-BASE (0.17-6) ...
+SETTING UP GETTEXT (0.17-6) ...
+SETTING UP INTLTOOL-DEBIAN (0.35.0+20060710.1) ...
+SETTING UP PO-DEBCONF (1.0.15) ...
+SETTING UP GROFF-BASE (1.18.1.1-21) ...
+SETTING UP BSDMAINUTILS (6.1.10) ...
+SETTING UP MAN-DB (2.5.4-1) ...
+BUILDING DATABASE OF MANUAL PAGES ...
+SETTING UP DEBHELPER (7.0.17) ...
+SETTING UP LIBDSHCONFIG1 (0.20.13-1) ...
+SETTING UP LIBDSHCONFIG1-DEV (0.20.13-1) ...
+SETTING UP LIBSGMLS-PERL (1.03II-32) ...
+SETTING UP LIBSP1C2 (1.3.4-1.2.1-47) ...
+SETTING UP SP (1.3.4-1.2.1-47) ...
+SETTING UP PO4A (0.34-2) ...
+SETTING UP PBUILDER-SATISFYDEPENDS-DUMMY (0.INVALID.0) ...
 Reading package lists...
 Building dependency tree...
 Reading state information...
@@ -199,16 +199,16 @@ Reading state information...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 116kB of archives.
+Need to get 117kB of archives.
 After this operation, 467kB of additional disk space will be used.
-Get:1 http://localhost squeeze/main fakeroot 1.11 [116kB]
+Get:1 http://localhost squeeze/main fakeroot 1.12.2 [117kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11413 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.11_amd64.deb) ...
+(Reading database ... 11439 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.12.2_amd64.deb) ...
 Processing triggers for man-db ...
-Setting up fakeroot (1.11) ...
+Setting up fakeroot (1.12.2) ...
 dpkg-buildpackage: set CFLAGS to default value: -g -O2
 dpkg-buildpackage: set CPPFLAGS to default value: 
 dpkg-buildpackage: set LDFLAGS to default value: 
@@ -331,7 +331,7 @@ checking for lf95... no
 checking for ftn... no
 checking whether we are using the GNU Fortran 77 compiler... no
 checking whether  accepts -g... no
-checking the maximum length of command line arguments... 98304
+checking the maximum length of command line arguments... 3458764513820540925
 checking command to parse /usr/bin/nm -B output from gcc object... ok
 checking for objdir... .libs
 checking for ar... ar
@@ -476,8 +476,8 @@ PASS: tests/param-f-fail.sh
 PASS: tests/param-f-with-space.sh
 PASS: tests/param-m.sh
 test to check that unknown parameter checking is right.
-./dsh: unrecognized option `--unknown-parameter'
-./dsh: invalid option -- u
+./dsh: unrecognized option '--unknown-parameter'
+./dsh: invalid option -- 'u'
 PASS: tests/param-unknown.sh
 test1
 test2
@@ -520,7 +520,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
-Thu Feb 26 05:00:09 UTC 2009
+Sat Mar 21 02:59:38 UTC 2009
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -590,12 +590,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
-Thu Feb 26 05:00:14 UTC 2009
+Sat Mar 21 02:59:43 UTC 2009
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-b: b
 c: c
+dsh: Process terminated (before write).
+b: b
 a: a
 PASS: tests/segv-catcher.sh
 l w
diff --git a/testsuite/normal/pdebuild-normal-lenny.log b/testsuite/normal/pdebuild-normal-lenny.log
index 9c0822d..22af35d 100644
--- a/testsuite/normal/pdebuild-normal-lenny.log
+++ b/testsuite/normal/pdebuild-normal-lenny.log
@@ -40,8 +40,8 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: source only upload (original source is included)
 W: /home/dancer/.pbuilderrc does not exist
 I: using fakeroot in build.
-I: Current time: Thu Feb 26 13:45:14 JST 2009
-I: pbuilder-time-stamp: 1235623514
+I: Current time: Sat Mar 21 11:24:34 JST 2009
+I: pbuilder-time-stamp: 1237602274
 I: Building the build Environment
 I: extracting base tarball [/TESTDIR/testimage]
 I: creating local configuration
@@ -498,8 +498,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
@@ -507,11 +507,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
-Thu Feb 26 04:46:12 UTC 2009
+Sat Mar 21 02:25:31 UTC 2009
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -581,7 +581,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
-Thu Feb 26 04:46:17 UTC 2009
+Sat Mar 21 02:25:36 UTC 2009
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -683,5 +683,5 @@ I: unmounting dev/pts filesystem
 I: unmounting proc filesystem
 I: cleaning the build env 
 I: removing directory /TESTDIR/dir3/NUM and its subdirectories
-I: Current time: Thu Feb 26 13:46:21 JST 2009
-I: pbuilder-time-stamp: 1235623581
+I: Current time: Sat Mar 21 11:25:39 JST 2009
+I: pbuilder-time-stamp: 1237602339
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 0874db6..9fde3d5 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -40,8 +40,8 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: source only upload (original source is included)
 W: /home/dancer/.pbuilderrc does not exist
 I: using fakeroot in build.
-I: Current time: Thu Feb 26 13:38:26 JST 2009
-I: pbuilder-time-stamp: 1235623106
+I: Current time: Sat Mar 21 11:17:14 JST 2009
+I: pbuilder-time-stamp: 1237601834
 I: Building the build Environment
 I: extracting base tarball [/TESTDIR/testimage]
 I: creating local configuration
@@ -66,7 +66,7 @@ Reading state information...
 aptitude is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Selecting previously deselected package pbuilder-satisfydepends-dummy.
-(Reading database ... 9767 files and directories currently installed.)
+(Reading database ... 9780 files and directories currently installed.)
 Unpacking pbuilder-satisfydepends-dummy (from .../pbuilder-satisfydepends-dummy.deb) ...
 dpkg: dependency problems prevent configuration of pbuilder-satisfydepends-dummy:
  pbuilder-satisfydepends-dummy depends on debhelper (>> 3.0.0); however:
@@ -93,97 +93,97 @@ The following NEW packages will be installed:
 The following partially installed packages will be configured:
   pbuilder-satisfydepends-dummy 
 0 packages upgraded, 21 newly installed, 0 to remove and 0 not upgraded.
-Need to get 11.2MB of archives. After unpacking 33.1MB will be used.
+Need to get 11.2MB of archives. After unpacking 33.2MB will be used.
 Writing extended state information...
 Get:1 http://localhost sid/main libmagic1 4.26-2 [369kB]
 Get:2 http://localhost sid/main file 4.26-2 [44.8kB]
 Get:3 http://localhost sid/main html2text 1.3.2a-13 [103kB]
 Get:4 http://localhost sid/main libpcre3 7.8-2 [215kB]
-Get:5 http://localhost sid/main libglib2.0-0 2.18.4-2 [844kB]
-Get:6 http://localhost sid/main libxml2 2.6.32.dfsg-5 [860kB]
+Get:5 http://localhost sid/main libglib2.0-0 2.20.0-2 [845kB]
+Get:6 http://localhost sid/main libxml2 2.7.3.dfsg-1 [870kB]
 Get:7 http://localhost sid/main libcroco3 0.6.1-2 [123kB]
 Get:8 http://localhost sid/main gettext-base 0.17-6 [125kB]
 Get:9 http://localhost sid/main gettext 0.17-6 [2710kB]
 Get:10 http://localhost sid/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:11 http://localhost sid/main po-debconf 1.0.15 [237kB]
-Get:12 http://localhost sid/main groff-base 1.18.1.1-21 [898kB]
+Get:12 http://localhost sid/main groff-base 1.18.1.1-22 [897kB]
 Get:13 http://localhost sid/main bsdmainutils 6.1.10 [179kB]
-Get:14 http://localhost sid/main man-db 2.5.4-1 [1386kB]
-Get:15 http://localhost sid/main debhelper 7.0.17 [554kB]
+Get:14 http://localhost sid/main man-db 2.5.5-1 [1387kB]
+Get:15 http://localhost sid/main debhelper 7.2.6 [550kB]
 Get:16 http://localhost sid/main libdshconfig1 0.20.13-1 [11.0kB]
 Get:17 http://localhost sid/main libdshconfig1-dev 0.20.13-1 [25.4kB]
 Get:18 http://localhost sid/main libsgmls-perl 1.03ii-32 [27.8kB]
 Get:19 http://localhost sid/main libsp1c2 1.3.4-1.2.1-47 [1386kB]
 Get:20 http://localhost sid/main sp 1.3.4-1.2.1-47 [182kB]
-Get:21 http://localhost sid/main po4a 0.34-2 [847kB]
+Get:21 http://localhost sid/main po4a 0.36-2 [870kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
-Selecting previously deselected package libmagic1.
-(Reading database ... 9767 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.26-2_amd64.deb) ...
-Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.26-2_amd64.deb) ...
-Selecting previously deselected package html2text.
-Unpacking html2text (from .../html2text_1.3.2a-13_amd64.deb) ...
-Selecting previously deselected package libpcre3.
-Unpacking libpcre3 (from .../libpcre3_7.8-2_amd64.deb) ...
-Selecting previously deselected package libglib2.0-0.
-Unpacking libglib2.0-0 (from .../libglib2.0-0_2.18.4-2_amd64.deb) ...
-Selecting previously deselected package libxml2.
-Unpacking libxml2 (from .../libxml2_2.6.32.dfsg-5_amd64.deb) ...
-Selecting previously deselected package libcroco3.
-Unpacking libcroco3 (from .../libcroco3_0.6.1-2_amd64.deb) ...
-Selecting previously deselected package gettext-base.
-Unpacking gettext-base (from .../gettext-base_0.17-6_amd64.deb) ...
-Selecting previously deselected package gettext.
-Unpacking gettext (from .../gettext_0.17-6_amd64.deb) ...
-Selecting previously deselected package intltool-debian.
-Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) ...
-Selecting previously deselected package po-debconf.
-Unpacking po-debconf (from .../po-debconf_1.0.15_all.deb) ...
-Selecting previously deselected package groff-base.
-Unpacking groff-base (from .../groff-base_1.18.1.1-21_amd64.deb) ...
-Selecting previously deselected package bsdmainutils.
-Unpacking bsdmainutils (from .../bsdmainutils_6.1.10_amd64.deb) ...
-Selecting previously deselected package man-db.
-Unpacking man-db (from .../man-db_2.5.4-1_amd64.deb) ...
-Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_7.0.17_all.deb) ...
-Selecting previously deselected package libdshconfig1.
-Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_amd64.deb) ...
-Selecting previously deselected package libdshconfig1-dev.
-Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.13-1_amd64.deb) ...
-Selecting previously deselected package libsgmls-perl.
-Unpacking libsgmls-perl (from .../libsgmls-perl_1.03ii-32_all.deb) ...
-Selecting previously deselected package libsp1c2.
-Unpacking libsp1c2 (from .../libsp1c2_1.3.4-1.2.1-47_amd64.deb) ...
-Selecting previously deselected package sp.
-Unpacking sp (from .../sp_1.3.4-1.2.1-47_amd64.deb) ...
-Selecting previously deselected package po4a.
-Unpacking po4a (from .../archives/po4a_0.34-2_all.deb) ...
-Setting up libmagic1 (4.26-2) ...
-Setting up file (4.26-2) ...
-Setting up html2text (1.3.2a-13) ...
-Setting up libpcre3 (7.8-2) ...
-Setting up libglib2.0-0 (2.18.4-2) ...
-Setting up libxml2 (2.6.32.dfsg-5) ...
-Setting up libcroco3 (0.6.1-2) ...
-Setting up gettext-base (0.17-6) ...
-Setting up gettext (0.17-6) ...
-Setting up intltool-debian (0.35.0+20060710.1) ...
-Setting up po-debconf (1.0.15) ...
-Setting up groff-base (1.18.1.1-21) ...
-Setting up bsdmainutils (6.1.10) ...
-Setting up man-db (2.5.4-1) ...
-Building database of manual pages ...
-Setting up debhelper (7.0.17) ...
-Setting up libdshconfig1 (0.20.13-1) ...
-Setting up libdshconfig1-dev (0.20.13-1) ...
-Setting up libsgmls-perl (1.03ii-32) ...
-Setting up libsp1c2 (1.3.4-1.2.1-47) ...
-Setting up sp (1.3.4-1.2.1-47) ...
-Setting up po4a (0.34-2) ...
-Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ...
+Selecting previously deselected package libmagic1.
+(Reading database ... 9780 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.26-2_amd64.deb) ...
+Selecting previously deselected package file.
+Unpacking file (from .../archives/file_4.26-2_amd64.deb) ...
+Selecting previously deselected package html2text.
+Unpacking html2text (from .../html2text_1.3.2a-13_amd64.deb) ...
+Selecting previously deselected package libpcre3.
+Unpacking libpcre3 (from .../libpcre3_7.8-2_amd64.deb) ...
+Selecting previously deselected package libglib2.0-0.
+Unpacking libglib2.0-0 (from .../libglib2.0-0_2.20.0-2_amd64.deb) ...
+Selecting previously deselected package libxml2.
+Unpacking libxml2 (from .../libxml2_2.7.3.dfsg-1_amd64.deb) ...
+Selecting previously deselected package libcroco3.
+Unpacking libcroco3 (from .../libcroco3_0.6.1-2_amd64.deb) ...
+Selecting previously deselected package gettext-base.
+Unpacking gettext-base (from .../gettext-base_0.17-6_amd64.deb) ...
+Selecting previously deselected package gettext.
+Unpacking gettext (from .../gettext_0.17-6_amd64.deb) ...
+Selecting previously deselected package intltool-debian.
+Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) ...
+Selecting previously deselected package po-debconf.
+Unpacking po-debconf (from .../po-debconf_1.0.15_all.deb) ...
+Selecting previously deselected package groff-base.
+Unpacking groff-base (from .../groff-base_1.18.1.1-22_amd64.deb) ...
+Selecting previously deselected package bsdmainutils.
+Unpacking bsdmainutils (from .../bsdmainutils_6.1.10_amd64.deb) ...
+Selecting previously deselected package man-db.
+Unpacking man-db (from .../man-db_2.5.5-1_amd64.deb) ...
+Selecting previously deselected package debhelper.
+Unpacking debhelper (from .../debhelper_7.2.6_all.deb) ...
+Selecting previously deselected package libdshconfig1.
+Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_amd64.deb) ...
+Selecting previously deselected package libdshconfig1-dev.
+Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.13-1_amd64.deb) ...
+Selecting previously deselected package libsgmls-perl.
+Unpacking libsgmls-perl (from .../libsgmls-perl_1.03ii-32_all.deb) ...
+Selecting previously deselected package libsp1c2.
+Unpacking libsp1c2 (from .../libsp1c2_1.3.4-1.2.1-47_amd64.deb) ...
+Selecting previously deselected package sp.
+Unpacking sp (from .../sp_1.3.4-1.2.1-47_amd64.deb) ...
+Selecting previously deselected package po4a.
+Unpacking po4a (from .../archives/po4a_0.36-2_all.deb) ...
+Setting up libmagic1 (4.26-2) ...
+Setting up file (4.26-2) ...
+Setting up html2text (1.3.2a-13) ...
+Setting up libpcre3 (7.8-2) ...
+Setting up libglib2.0-0 (2.20.0-2) ...
+Setting up libxml2 (2.7.3.dfsg-1) ...
+Setting up libcroco3 (0.6.1-2) ...
+Setting up gettext-base (0.17-6) ...
+Setting up gettext (0.17-6) ...
+Setting up intltool-debian (0.35.0+20060710.1) ...
+Setting up po-debconf (1.0.15) ...
+Setting up groff-base (1.18.1.1-22) ...
+Setting up bsdmainutils (6.1.10) ...
+Setting up man-db (2.5.5-1) ...
+Building database of manual pages ...
+Setting up debhelper (7.2.6) ...
+Setting up libdshconfig1 (0.20.13-1) ...
+Setting up libdshconfig1-dev (0.20.13-1) ...
+Setting up libsgmls-perl (1.03ii-32) ...
+Setting up libsp1c2 (1.3.4-1.2.1-47) ...
+Setting up sp (1.3.4-1.2.1-47) ...
+Setting up po4a (0.36-2) ...
+Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ...
 Reading package lists...
 Building dependency tree...
 Reading state information...
@@ -197,16 +197,16 @@ Reading state information...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 116kB of archives.
+Need to get 117kB of archives.
 After this operation, 467kB of additional disk space will be used.
-Get:1 http://localhost sid/main fakeroot 1.12.1 [116kB]
+Get:1 http://localhost sid/main fakeroot 1.12.2 [117kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11313 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.12.1_amd64.deb) ...
+(Reading database ... 11327 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.12.2_amd64.deb) ...
 Processing triggers for man-db ...
-Setting up fakeroot (1.12.1) ...
+Setting up fakeroot (1.12.2) ...
 I: Copying source file
 I: copying [../dsh_0.25.10-1.dsc]
 I: copying [../dsh_0.25.10.orig.tar.gz]
@@ -513,10 +513,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
+a: 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
@@ -528,7 +528,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
-Thu Feb 26 04:39:27 UTC 2009
+Sat Mar 21 02:18:46 UTC 2009
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -598,14 +598,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
-Thu Feb 26 04:39:32 UTC 2009
+Sat Mar 21 02:18:51 UTC 2009
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
+c: c
 b: b
+a: a
 dsh: Process terminated (before write).
-c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -700,5 +700,5 @@ I: unmounting dev/pts filesystem
 I: unmounting proc filesystem
 I: cleaning the build env 
 I: removing directory /TESTDIR/dir3/NUM and its subdirectories
-I: Current time: Thu Feb 26 13:39:36 JST 2009
-I: pbuilder-time-stamp: 1235623176
+I: Current time: Sat Mar 21 11:18:55 JST 2009
+I: pbuilder-time-stamp: 1237601935
diff --git a/testsuite/normal/pdebuild-normal-squeeze.log b/testsuite/normal/pdebuild-normal-squeeze.log
index 1fca2bd..fbf3006 100644
--- a/testsuite/normal/pdebuild-normal-squeeze.log
+++ b/testsuite/normal/pdebuild-normal-squeeze.log
@@ -40,8 +40,8 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: source only upload (original source is included)
 W: /home/dancer/.pbuilderrc does not exist
 I: using fakeroot in build.
-I: Current time: Thu Feb 26 13:57:13 JST 2009
-I: pbuilder-time-stamp: 1235624233
+I: Current time: Sat Mar 21 11:51:27 JST 2009
+I: pbuilder-time-stamp: 1237603887
 I: Building the build Environment
 I: extracting base tarball [/TESTDIR/testimage]
 I: creating local configuration
@@ -66,7 +66,7 @@ Reading state information...
 aptitude is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Selecting previously deselected package pbuilder-satisfydepends-dummy.
-(Reading database ... 9677 files and directories currently installed.)
+(Reading database ... 9700 files and directories currently installed.)
 Unpacking pbuilder-satisfydepends-dummy (from .../pbuilder-satisfydepends-dummy.deb) ...
 dpkg: dependency problems prevent configuration of pbuilder-satisfydepends-dummy:
  pbuilder-satisfydepends-dummy depends on debhelper (>> 3.0.0); however:
@@ -93,14 +93,14 @@ The following NEW packages will be installed:
 The following partially installed packages will be configured:
   pbuilder-satisfydepends-dummy 
 0 packages upgraded, 21 newly installed, 0 to remove and 0 not upgraded.
-Need to get 10.9MB of archives. After unpacking 32.5MB will be used.
+Need to get 11.2MB of archives. After unpacking 33.1MB will be used.
 Writing extended state information...
 Get:1 http://localhost squeeze/main libmagic1 4.26-2 [369kB]
 Get:2 http://localhost squeeze/main file 4.26-2 [44.8kB]
-Get:3 http://localhost squeeze/main html2text 1.3.2a-5 [95.9kB]
+Get:3 http://localhost squeeze/main html2text 1.3.2a-13 [103kB]
 Get:4 http://localhost squeeze/main libpcre3 7.8-2 [215kB]
-Get:5 http://localhost squeeze/main libglib2.0-0 2.16.6-1 [826kB]
-Get:6 http://localhost squeeze/main libxml2 2.6.32.dfsg-5 [860kB]
+Get:5 http://localhost squeeze/main libglib2.0-0 2.18.4-2 [844kB]
+Get:6 http://localhost squeeze/main libxml2 2.7.3.dfsg-1 [870kB]
 Get:7 http://localhost squeeze/main libcroco3 0.6.1-2 [123kB]
 Get:8 http://localhost squeeze/main gettext-base 0.17-6 [125kB]
 Get:9 http://localhost squeeze/main gettext 0.17-6 [2710kB]
@@ -108,7 +108,7 @@ Get:10 http://localhost squeeze/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:11 http://localhost squeeze/main po-debconf 1.0.15 [237kB]
 Get:12 http://localhost squeeze/main groff-base 1.18.1.1-21 [898kB]
 Get:13 http://localhost squeeze/main bsdmainutils 6.1.10 [179kB]
-Get:14 http://localhost squeeze/main man-db 2.5.2-4 [1107kB]
+Get:14 http://localhost squeeze/main man-db 2.5.4-1 [1386kB]
 Get:15 http://localhost squeeze/main debhelper 7.0.17 [554kB]
 Get:16 http://localhost squeeze/main libdshconfig1 0.20.13-1 [11.0kB]
 Get:17 http://localhost squeeze/main libdshconfig1-dev 0.20.13-1 [25.4kB]
@@ -118,72 +118,72 @@ Get:20 http://localhost squeeze/main sp 1.3.4-1.2.1-47 [182kB]
 Get:21 http://localhost squeeze/main po4a 0.34-2 [847kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
-SELECTING PREVIOUSLY DESELECTED PACKAGE LIBMAGIC1.
-(READING DATABASE ... 9677 FILES AND DIRECTORIES CURRENTLY INSTALLED.)
-UNPACKING LIBMAGIC1 (FROM .../LIBMAGIC1_4.26-2_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE FILE.
-UNPACKING FILE (FROM .../ARCHIVES/FILE_4.26-2_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE HTML2TEXT.
-UNPACKING HTML2TEXT (FROM .../HTML2TEXT_1.3.2A-5_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE LIBPCRE3.
-UNPACKING LIBPCRE3 (FROM .../LIBPCRE3_7.8-2_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE LIBGLIB2.0-0.
-UNPACKING LIBGLIB2.0-0 (FROM .../LIBGLIB2.0-0_2.16.6-1_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE LIBXML2.
-UNPACKING LIBXML2 (FROM .../LIBXML2_2.6.32.DFSG-5_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE LIBCROCO3.
-UNPACKING LIBCROCO3 (FROM .../LIBCROCO3_0.6.1-2_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE GETTEXT-BASE.
-UNPACKING GETTEXT-BASE (FROM .../GETTEXT-BASE_0.17-6_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE GETTEXT.
-UNPACKING GETTEXT (FROM .../GETTEXT_0.17-6_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE INTLTOOL-DEBIAN.
-UNPACKING INTLTOOL-DEBIAN (FROM .../INTLTOOL-DEBIAN_0.35.0+20060710.1_ALL.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE PO-DEBCONF.
-UNPACKING PO-DEBCONF (FROM .../PO-DEBCONF_1.0.15_ALL.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE GROFF-BASE.
-UNPACKING GROFF-BASE (FROM .../GROFF-BASE_1.18.1.1-21_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE BSDMAINUTILS.
-UNPACKING BSDMAINUTILS (FROM .../BSDMAINUTILS_6.1.10_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE MAN-DB.
-UNPACKING MAN-DB (FROM .../MAN-DB_2.5.2-4_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE DEBHELPER.
-UNPACKING DEBHELPER (FROM .../DEBHELPER_7.0.17_ALL.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE LIBDSHCONFIG1.
-UNPACKING LIBDSHCONFIG1 (FROM .../LIBDSHCONFIG1_0.20.13-1_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE LIBDSHCONFIG1-DEV.
-UNPACKING LIBDSHCONFIG1-DEV (FROM .../LIBDSHCONFIG1-DEV_0.20.13-1_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE LIBSGMLS-PERL.
-UNPACKING LIBSGMLS-PERL (FROM .../LIBSGMLS-PERL_1.03II-32_ALL.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE LIBSP1C2.
-UNPACKING LIBSP1C2 (FROM .../LIBSP1C2_1.3.4-1.2.1-47_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE SP.
-UNPACKING SP (FROM .../SP_1.3.4-1.2.1-47_AMD64.DEB) ...
-SELECTING PREVIOUSLY DESELECTED PACKAGE PO4A.
-UNPACKING PO4A (FROM .../ARCHIVES/PO4A_0.34-2_ALL.DEB) ...
-SETTING UP LIBMAGIC1 (4.26-2) ...
-SETTING UP FILE (4.26-2) ...
-SETTING UP HTML2TEXT (1.3.2A-5) ...
-SETTING UP LIBPCRE3 (7.8-2) ...
-SETTING UP LIBGLIB2.0-0 (2.16.6-1) ...
-SETTING UP LIBXML2 (2.6.32.DFSG-5) ...
-SETTING UP LIBCROCO3 (0.6.1-2) ...
-SETTING UP GETTEXT-BASE (0.17-6) ...
-SETTING UP GETTEXT (0.17-6) ...
-SETTING UP INTLTOOL-DEBIAN (0.35.0+20060710.1) ...
-SETTING UP PO-DEBCONF (1.0.15) ...
-SETTING UP GROFF-BASE (1.18.1.1-21) ...
-SETTING UP BSDMAINUTILS (6.1.10) ...
-SETTING UP MAN-DB (2.5.2-4) ...
-BUILDING DATABASE OF MANUAL PAGES ...
-SETTING UP DEBHELPER (7.0.17) ...
-SETTING UP LIBDSHCONFIG1 (0.20.13-1) ...
-SETTING UP LIBDSHCONFIG1-DEV (0.20.13-1) ...
-SETTING UP LIBSGMLS-PERL (1.03II-32) ...
-SETTING UP LIBSP1C2 (1.3.4-1.2.1-47) ...
-SETTING UP SP (1.3.4-1.2.1-47) ...
-SETTING UP PO4A (0.34-2) ...
-SETTING UP PBUILDER-SATISFYDEPENDS-DUMMY (0.INVALID.0) ...
+Selecting previously deselected package libmagic1.
+(Reading database ... 9700 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.26-2_amd64.deb) ...
+Selecting previously deselected package file.
+Unpacking file (from .../archives/file_4.26-2_amd64.deb) ...
+Selecting previously deselected package html2text.
+Unpacking html2text (from .../html2text_1.3.2a-13_amd64.deb) ...
+Selecting previously deselected package libpcre3.
+Unpacking libpcre3 (from .../libpcre3_7.8-2_amd64.deb) ...
+Selecting previously deselected package libglib2.0-0.
+Unpacking libglib2.0-0 (from .../libglib2.0-0_2.18.4-2_amd64.deb) ...
+Selecting previously deselected package libxml2.
+Unpacking libxml2 (from .../libxml2_2.7.3.dfsg-1_amd64.deb) ...
+Selecting previously deselected package libcroco3.
+Unpacking libcroco3 (from .../libcroco3_0.6.1-2_amd64.deb) ...
+Selecting previously deselected package gettext-base.
+Unpacking gettext-base (from .../gettext-base_0.17-6_amd64.deb) ...
+Selecting previously deselected package gettext.
+Unpacking gettext (from .../gettext_0.17-6_amd64.deb) ...
+Selecting previously deselected package intltool-debian.
+Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) ...
+Selecting previously deselected package po-debconf.
+Unpacking po-debconf (from .../po-debconf_1.0.15_all.deb) ...
+Selecting previously deselected package groff-base.
+Unpacking groff-base (from .../groff-base_1.18.1.1-21_amd64.deb) ...
+Selecting previously deselected package bsdmainutils.
+Unpacking bsdmainutils (from .../bsdmainutils_6.1.10_amd64.deb) ...
+Selecting previously deselected package man-db.
+Unpacking man-db (from .../man-db_2.5.4-1_amd64.deb) ...
+Selecting previously deselected package debhelper.
+Unpacking debhelper (from .../debhelper_7.0.17_all.deb) ...
+Selecting previously deselected package libdshconfig1.
+Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_amd64.deb) ...
+Selecting previously deselected package libdshconfig1-dev.
+Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.13-1_amd64.deb) ...
+Selecting previously deselected package libsgmls-perl.
+Unpacking libsgmls-perl (from .../libsgmls-perl_1.03ii-32_all.deb) ...
+Selecting previously deselected package libsp1c2.
+Unpacking libsp1c2 (from .../libsp1c2_1.3.4-1.2.1-47_amd64.deb) ...
+Selecting previously deselected package sp.
+Unpacking sp (from .../sp_1.3.4-1.2.1-47_amd64.deb) ...
+Selecting previously deselected package po4a.
+Unpacking po4a (from .../archives/po4a_0.34-2_all.deb) ...
+Setting up libmagic1 (4.26-2) ...
+Setting up file (4.26-2) ...
+Setting up html2text (1.3.2a-13) ...
+Setting up libpcre3 (7.8-2) ...
+Setting up libglib2.0-0 (2.18.4-2) ...
+Setting up libxml2 (2.7.3.dfsg-1) ...
+Setting up libcroco3 (0.6.1-2) ...
+Setting up gettext-base (0.17-6) ...
+Setting up gettext (0.17-6) ...
+Setting up intltool-debian (0.35.0+20060710.1) ...
+Setting up po-debconf (1.0.15) ...
+Setting up groff-base (1.18.1.1-21) ...
+Setting up bsdmainutils (6.1.10) ...
+Setting up man-db (2.5.4-1) ...
+Building database of manual pages ...
+Setting up debhelper (7.0.17) ...
+Setting up libdshconfig1 (0.20.13-1) ...
+Setting up libdshconfig1-dev (0.20.13-1) ...
+Setting up libsgmls-perl (1.03ii-32) ...
+Setting up libsp1c2 (1.3.4-1.2.1-47) ...
+Setting up sp (1.3.4-1.2.1-47) ...
+Setting up po4a (0.34-2) ...
+Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ...
 Reading package lists...
 Building dependency tree...
 Reading state information...
@@ -197,16 +197,16 @@ Reading state information...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 116kB of archives.
+Need to get 117kB of archives.
 After this operation, 467kB of additional disk space will be used.
-Get:1 http://localhost squeeze/main fakeroot 1.11 [116kB]
+Get:1 http://localhost squeeze/main fakeroot 1.12.2 [117kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11221 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.11_amd64.deb) ...
+(Reading database ... 11246 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.12.2_amd64.deb) ...
 Processing triggers for man-db ...
-Setting up fakeroot (1.11) ...
+Setting up fakeroot (1.12.2) ...
 I: Copying source file
 I: copying [../dsh_0.25.10-1.dsc]
 I: copying [../dsh_0.25.10.orig.tar.gz]
@@ -339,7 +339,7 @@ checking for lf95... no
 checking for ftn... no
 checking whether we are using the GNU Fortran 77 compiler... no
 checking whether  accepts -g... no
-checking the maximum length of command line arguments... 98304
+checking the maximum length of command line arguments... 3458764513820540925
 checking command to parse /usr/bin/nm -B output from gcc object... ok
 checking for objdir... .libs
 checking for ar... ar
@@ -484,8 +484,8 @@ PASS: tests/param-f-fail.sh
 PASS: tests/param-f-with-space.sh
 PASS: tests/param-m.sh
 test to check that unknown parameter checking is right.
-./dsh: unrecognized option `--unknown-parameter'
-./dsh: invalid option -- u
+./dsh: unrecognized option '--unknown-parameter'
+./dsh: invalid option -- 'u'
 PASS: tests/param-unknown.sh
 test1
 test2
@@ -513,10 +513,10 @@ success
 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
+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
@@ -528,7 +528,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
-Thu Feb 26 04:58:13 UTC 2009
+Sat Mar 21 02:54:39 UTC 2009
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -598,12 +598,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
-Thu Feb 26 04:58:18 UTC 2009
+Sat Mar 21 02:54:44 UTC 2009
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-c: c
 a: a
+c: c
+dsh: Process terminated (before write).
 b: b
 PASS: tests/segv-catcher.sh
 l w
@@ -699,5 +700,5 @@ I: unmounting dev/pts filesystem
 I: unmounting proc filesystem
 I: cleaning the build env 
 I: removing directory /TESTDIR/dir3/NUM and its subdirectories
-I: Current time: Thu Feb 26 13:58:21 JST 2009
-I: pbuilder-time-stamp: 1235624301
+I: Current time: Sat Mar 21 11:55:13 JST 2009
+I: pbuilder-time-stamp: 1237604113
author	Junichi Uekawa <dancer@netfort.gr.jp>	2009-05-31 10:49:03 +0900
committer	Junichi Uekawa <dancer@netfort.gr.jp>	2009-05-31 10:49:03 +0900
commit	5b9a957c236043d2bacd8badda61669049518343 (patch)
tree	f99e94628f632120db20a6adc7e3822c548f7ea0 /testsuite/normal
parent	0ac8590bd15c7fa9c5e3f5625ad6d1c3c95fb608 (diff)
download	pbuilder-5b9a957c236043d2bacd8badda61669049518343.tar pbuilder-5b9a957c236043d2bacd8badda61669049518343.tar.gz