testsuite update

1 files changed, 113 insertions, 119 deletions

diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index 7beca54..87edfb9 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -11,170 +11,164 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp sid Release [79.6kB]
-Get:3 http://cdn.debian.or.jp sid/main Packages [6463kB]
+Get:3 http://cdn.debian.or.jp sid/main Packages [6488kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
 Building dependency tree...
 The following packages will be upgraded:
-  aptitude coreutils cpp-4.2 dpkg dpkg-dev dselect g++-4.2 gcc-4.2
-  gcc-4.2-base laptop-detect libc6 libc6-dev libdb4.6 libgcc1 libgomp1
-  libncurses5 libncursesw5 libsasl2-2 libslang2 libstdc++6 libstdc++6-4.2-dev
-  man-db ncurses-base ncurses-bin perl perl-base perl-modules procps
-  traceroute tzdata zlib1g
-31 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 35.4MB of archives.
-After unpacking 2060kB disk space will be freed.
+  coreutils cpp-4.2 debianutils g++-4.2 gcc-4.2 gcc-4.2-base gzip
+  laptop-detect libc6 libc6-dev libdb4.6 libgcc1 libgomp1 libncurses5
+  libncursesw5 libsasl2-2 libslang2 libssl0.9.8 libstdc++6 libstdc++6-4.2-dev
+  man-db ncurses-base ncurses-bin net-tools perl perl-base perl-modules tzdata
+  vim-common vim-tiny
+30 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 31.2MB of archives.
+After unpacking 1913kB disk space will be freed.
 Get:1 http://cdn.debian.or.jp sid/main coreutils 5.97-5.4 [3213kB]
-Get:2 http://cdn.debian.or.jp sid/main dpkg 1.14.7 [2129kB]
-Get:3 http://cdn.debian.or.jp sid/main ncurses-bin 5.6+20071006-2 [159kB]
-Get:4 http://cdn.debian.or.jp sid/main perl-modules 5.8.8-11 [2300kB]
-Get:5 http://cdn.debian.or.jp sid/main libc6-dev 2.6.1-5 [2487kB]
-Get:6 http://cdn.debian.or.jp sid/main libgomp1 4.2.2-1 [13.4kB]
-Get:7 http://cdn.debian.or.jp sid/main cpp-4.2 4.2.2-1 [2706kB]
-Get:8 http://cdn.debian.or.jp sid/main gcc-4.2-base 4.2.2-1 [103kB]
-Get:9 http://cdn.debian.or.jp sid/main libgcc1 1:4.2.2-1 [26.7kB]
-Get:10 http://cdn.debian.or.jp sid/main gcc-4.2 4.2.2-1 [605kB]
-Get:11 http://cdn.debian.or.jp sid/main g++-4.2 4.2.2-1 [3027kB]
-Get:12 http://cdn.debian.or.jp sid/main libstdc++6-4.2-dev 4.2.2-1 [1214kB]
-Get:13 http://cdn.debian.or.jp sid/main libstdc++6 4.2.2-1 [313kB]
-Get:14 http://cdn.debian.or.jp sid/main libc6 2.6.1-5 [4776kB]
-Get:15 http://cdn.debian.or.jp sid/main libdb4.6 4.6.21-1 [580kB]
-Get:16 http://cdn.debian.or.jp sid/main perl 5.8.8-11 [4052kB]
-Get:17 http://cdn.debian.or.jp sid/main perl-base 5.8.8-11 [837kB]
-Get:18 http://cdn.debian.or.jp sid/main libncurses5 5.6+20071006-2 [303kB]
-Get:19 http://cdn.debian.or.jp sid/main ncurses-base 5.6+20071006-2 [13.1kB]
-Get:20 http://cdn.debian.or.jp sid/main libslang2 2.0.7-5 [459kB]
-Get:21 http://cdn.debian.or.jp sid/main tzdata 2007h-1 [724kB]
-Get:22 http://cdn.debian.or.jp sid/main zlib1g 1:1.2.3.3.dfsg-6 [74.1kB]
-Get:23 http://cdn.debian.or.jp sid/main libncursesw5 5.6+20071006-2 [324kB]
-Get:24 http://cdn.debian.or.jp sid/main aptitude 0.4.6.1-1.1 [2951kB]
-Get:25 http://cdn.debian.or.jp sid/main laptop-detect 0.13.2 [4764B]
-Get:26 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-15 [108kB]
-Get:27 http://cdn.debian.or.jp sid/main man-db 2.5.0-2 [840kB]
-Get:28 http://cdn.debian.or.jp sid/main traceroute 2.0.9-1 [50.9kB]
-Get:29 http://cdn.debian.or.jp sid/main dselect 1.14.7 [514kB]
-Get:30 http://cdn.debian.or.jp sid/main procps 1:3.2.7-5 [234kB]
-Get:31 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.7 [228kB]
-
Extracting templates from packages: 96%
Extracting templates from packages: 100%
+Get:2 http://cdn.debian.or.jp sid/main debianutils 2.25.2 [54.3kB]
+Get:3 http://cdn.debian.or.jp sid/main gzip 1.3.12-3.2 [106kB]
+Get:4 http://cdn.debian.or.jp sid/main libc6-dev 2.6.1-6 [2489kB]
+Get:5 http://cdn.debian.or.jp sid/main libgomp1 4.2.2-3 [13.4kB]
+Get:6 http://cdn.debian.or.jp sid/main cpp-4.2 4.2.2-3 [2707kB]
+Get:7 http://cdn.debian.or.jp sid/main gcc-4.2-base 4.2.2-3 [103kB]
+Get:8 http://cdn.debian.or.jp sid/main libgcc1 1:4.2.2-3 [26.7kB]
+Get:9 http://cdn.debian.or.jp sid/main gcc-4.2 4.2.2-3 [606kB]
+Get:10 http://cdn.debian.or.jp sid/main g++-4.2 4.2.2-3 [3027kB]
+Get:11 http://cdn.debian.or.jp sid/main libstdc++6-4.2-dev 4.2.2-3 [1214kB]
+Get:12 http://cdn.debian.or.jp sid/main libstdc++6 4.2.2-3 [313kB]
+Get:13 http://cdn.debian.or.jp sid/main libc6 2.6.1-6 [4778kB]
+Get:14 http://cdn.debian.or.jp sid/main libncurses5 5.6+20071013-1 [339kB]
+Get:15 http://cdn.debian.or.jp sid/main ncurses-bin 5.6+20071013-1 [138kB]
+Get:16 http://cdn.debian.or.jp sid/main perl-modules 5.8.8-11.1 [2300kB]
+Get:17 http://cdn.debian.or.jp sid/main libdb4.6 4.6.21-3 [581kB]
+Get:18 http://cdn.debian.or.jp sid/main perl 5.8.8-11.1 [4052kB]
+Get:19 http://cdn.debian.or.jp sid/main perl-base 5.8.8-11.1 [837kB]
+Get:20 http://cdn.debian.or.jp sid/main ncurses-base 5.6+20071013-1 [13.2kB]
+Get:21 http://cdn.debian.or.jp sid/main libslang2 2.0.7-5 [459kB]
+Get:22 http://cdn.debian.or.jp sid/main tzdata 2007h-2 [724kB]
+Get:23 http://cdn.debian.or.jp sid/main laptop-detect 0.13.2 [4764B]
+Get:24 http://cdn.debian.or.jp sid/main libncursesw5 5.6+20071013-1 [361kB]
+Get:25 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-15 [108kB]
+Get:26 http://cdn.debian.or.jp sid/main libssl0.9.8 0.9.8f-1 [944kB]
+Get:27 http://cdn.debian.or.jp sid/main man-db 2.5.0-3 [840kB]
+Get:28 http://cdn.debian.or.jp sid/main net-tools 1.60-17.1 [278kB]
+Get:29 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-138+1 [372kB]
+Get:30 http://cdn.debian.or.jp sid/main vim-common 1:7.1-138+1 [185kB]
 Preconfiguring packages ...
 Fetched XXXB in Xs (XXXXXB/s)
-(Reading database ... 11968 files and directories currently installed.)
+(Reading database ... 11969 files and directories currently installed.)
 Preparing to replace coreutils 5.97-5.3 (using .../coreutils_5.97-5.4_amd64.deb) ...
 Unpacking replacement coreutils ...
 Setting up coreutils (5.97-5.4) ...
-(Reading database ... 11968 files and directories currently installed.)
-Preparing to replace dpkg 1.14.6 (using .../archives/dpkg_1.14.7_amd64.deb) ...
-Unpacking replacement dpkg ...
-Setting up dpkg (1.14.7) ...
-(Reading database ... 11968 files and directories currently installed.)
-Preparing to replace ncurses-bin 5.6+20070908-1 (using .../ncurses-bin_5.6+20071006-2_amd64.deb) ...
-Unpacking replacement ncurses-bin ...
-Setting up ncurses-bin (5.6+20071006-2) ...
-(Reading database ... 11968 files and directories currently installed.)
-Preparing to replace perl-modules 5.8.8-7 (using .../perl-modules_5.8.8-11_all.deb) ...
-Unpacking replacement perl-modules ...
-Preparing to replace libc6-dev 2.6.1-1 (using .../libc6-dev_2.6.1-5_amd64.deb) ...
+(Reading database ... 11969 files and directories currently installed.)
+Preparing to replace debianutils 2.25.1 (using .../debianutils_2.25.2_amd64.deb) ...
+Unpacking replacement debianutils ...
+Setting up debianutils (2.25.2) ...
+(Reading database ... 11969 files and directories currently installed.)
+Preparing to replace gzip 1.3.12-3.1 (using .../gzip_1.3.12-3.2_amd64.deb) ...
+Unpacking replacement gzip ...
+Setting up gzip (1.3.12-3.2) ...
+(Reading database ... 11969 files and directories currently installed.)
+Preparing to replace libc6-dev 2.6.1-1 (using .../libc6-dev_2.6.1-6_amd64.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace libgomp1 4.2.1-4 (using .../libgomp1_4.2.2-1_amd64.deb) ...
+Preparing to replace libgomp1 4.2.1-4 (using .../libgomp1_4.2.2-3_amd64.deb) ...
 Unpacking replacement libgomp1 ...
-Preparing to replace cpp-4.2 4.2.1-4 (using .../cpp-4.2_4.2.2-1_amd64.deb) ...
+Preparing to replace cpp-4.2 4.2.1-4 (using .../cpp-4.2_4.2.2-3_amd64.deb) ...
 Unpacking replacement cpp-4.2 ...
-Preparing to replace gcc-4.2-base 4.2.1-4 (using .../gcc-4.2-base_4.2.2-1_amd64.deb) ...
+Preparing to replace gcc-4.2-base 4.2.1-4 (using .../gcc-4.2-base_4.2.2-3_amd64.deb) ...
 Unpacking replacement gcc-4.2-base ...
-Preparing to replace libgcc1 1:4.2.1-4 (using .../libgcc1_1%3a4.2.2-1_amd64.deb) ...
+Preparing to replace libgcc1 1:4.2.1-4 (using .../libgcc1_1%3a4.2.2-3_amd64.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up gcc-4.2-base (4.2.2-1) ...
-Setting up libgcc1 (1:4.2.2-1) ...
-(Reading database ... 11966 files and directories currently installed.)
-Preparing to replace gcc-4.2 4.2.1-4 (using .../gcc-4.2_4.2.2-1_amd64.deb) ...
+Setting up gcc-4.2-base (4.2.2-3) ...
+Setting up libgcc1 (1:4.2.2-3) ...
+(Reading database ... 11970 files and directories currently installed.)
+Preparing to replace gcc-4.2 4.2.1-4 (using .../gcc-4.2_4.2.2-3_amd64.deb) ...
 Unpacking replacement gcc-4.2 ...
-Preparing to replace g++-4.2 4.2.1-4 (using .../g++-4.2_4.2.2-1_amd64.deb) ...
+Preparing to replace g++-4.2 4.2.1-4 (using .../g++-4.2_4.2.2-3_amd64.deb) ...
 Unpacking replacement g++-4.2 ...
-Preparing to replace libstdc++6-4.2-dev 4.2.1-4 (using .../libstdc++6-4.2-dev_4.2.2-1_amd64.deb) ...
+Preparing to replace libstdc++6-4.2-dev 4.2.1-4 (using .../libstdc++6-4.2-dev_4.2.2-3_amd64.deb) ...
 Unpacking replacement libstdc++6-4.2-dev ...
-Preparing to replace libstdc++6 4.2.1-4 (using .../libstdc++6_4.2.2-1_amd64.deb) ...
+Preparing to replace libstdc++6 4.2.1-4 (using .../libstdc++6_4.2.2-3_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.2.2-1) ...
-(Reading database ... 11967 files and directories currently installed.)
-Preparing to replace libc6 2.6.1-1 (using .../libc6_2.6.1-5_amd64.deb) ...
+Setting up libstdc++6 (4.2.2-3) ...
+(Reading database ... 11971 files and directories currently installed.)
+Preparing to replace libc6 2.6.1-1 (using .../libc6_2.6.1-6_amd64.deb) ...
 Unpacking replacement libc6 ...
-Setting up libc6 (2.6.1-5) ...
+Setting up libc6 (2.6.1-6) ...
 Installing new version of config file /etc/gai.conf ...
-(Reading database ... 11967 files and directories currently installed.)
-Preparing to replace libdb4.6 4.6.19-1 (using .../libdb4.6_4.6.21-1_amd64.deb) ...
+(Reading database ... 11971 files and directories currently installed.)
+Preparing to replace libncurses5 5.6+20070908-1 (using .../libncurses5_5.6+20071013-1_amd64.deb) ...
+Unpacking replacement libncurses5 ...
+Setting up libncurses5 (5.6+20071013-1) ...
+(Reading database ... 11973 files and directories currently installed.)
+Preparing to replace ncurses-bin 5.6+20070908-1 (using .../ncurses-bin_5.6+20071013-1_amd64.deb) ...
+Unpacking replacement ncurses-bin ...
+Setting up ncurses-bin (5.6+20071013-1) ...
+(Reading database ... 11973 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.8-7 (using .../perl-modules_5.8.8-11.1_all.deb) ...
+Unpacking replacement perl-modules ...
+Preparing to replace libdb4.6 4.6.19-1 (using .../libdb4.6_4.6.21-3_amd64.deb) ...
 Unpacking replacement libdb4.6 ...
-Preparing to replace perl 5.8.8-7 (using .../perl_5.8.8-11_amd64.deb) ...
+Preparing to replace perl 5.8.8-7 (using .../perl_5.8.8-11.1_amd64.deb) ...
 Unpacking replacement perl ...
-Preparing to replace perl-base 5.8.8-7 (using .../perl-base_5.8.8-11_amd64.deb) ...
+Preparing to replace perl-base 5.8.8-7 (using .../perl-base_5.8.8-11.1_amd64.deb) ...
 Unpacking replacement perl-base ...
-Setting up perl-base (5.8.8-11) ...
-(Reading database ... 11589 files and directories currently installed.)
-Preparing to replace libncurses5 5.6+20070908-1 (using .../libncurses5_5.6+20071006-2_amd64.deb) ...
-Unpacking replacement libncurses5 ...
-Setting up libncurses5 (5.6+20071006-2) ...
-(Reading database ... 11589 files and directories currently installed.)
-Preparing to replace ncurses-base 5.6+20070908-1 (using .../ncurses-base_5.6+20071006-2_all.deb) ...
+Setting up perl-base (5.8.8-11.1) ...
+(Reading database ... 11593 files and directories currently installed.)
+Preparing to replace ncurses-base 5.6+20070908-1 (using .../ncurses-base_5.6+20071013-1_all.deb) ...
 Unpacking replacement ncurses-base ...
-Setting up ncurses-base (5.6+20071006-2) ...
-(Reading database ... 11589 files and directories currently installed.)
+Setting up ncurses-base (5.6+20071013-1) ...
+(Reading database ... 11593 files and directories currently installed.)
 Preparing to replace libslang2 2.0.7-3 (using .../libslang2_2.0.7-5_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.7-5) ...
-(Reading database ... 11589 files and directories currently installed.)
-Preparing to replace tzdata 2007g-2 (using .../tzdata_2007h-1_all.deb) ...
+(Reading database ... 11593 files and directories currently installed.)
+Preparing to replace tzdata 2007h-1 (using .../tzdata_2007h-2_all.deb) ...
 Unpacking replacement tzdata ...
-Setting up tzdata (2007h-1) ...
+Setting up tzdata (2007h-2) ...
 
 User defined timezone, leaving /etc/localtime unchanged.
 Local time is now: XXXX
 Universal Time is now: XXXX
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
-(Reading database ... 11589 files and directories currently installed.)
-Preparing to replace zlib1g 1:1.2.3.3.dfsg-5 (using .../zlib1g_1%3a1.2.3.3.dfsg-6_amd64.deb) ...
-Unpacking replacement zlib1g ...
-Setting up zlib1g (1:1.2.3.3.dfsg-6) ...
-(Reading database ... 11589 files and directories currently installed.)
-Preparing to replace libncursesw5 5.6+20070908-1 (using .../libncursesw5_5.6+20071006-2_amd64.deb) ...
-Unpacking replacement libncursesw5 ...
-Preparing to replace aptitude 0.4.6.1-1 (using .../aptitude_0.4.6.1-1.1_amd64.deb) ...
-Unpacking replacement aptitude ...
+(Reading database ... 11593 files and directories currently installed.)
 Preparing to replace laptop-detect 0.12.1-0.1 (using .../laptop-detect_0.13.2_amd64.deb) ...
 Unpacking replacement laptop-detect ...
+Preparing to replace libncursesw5 5.6+20070908-1 (using .../libncursesw5_5.6+20071013-1_amd64.deb) ...
+Unpacking replacement libncursesw5 ...
 Preparing to replace libsasl2-2 2.1.22.dfsg1-14 (using .../libsasl2-2_2.1.22.dfsg1-15_amd64.deb) ...
 Unpacking replacement libsasl2-2 ...
-Preparing to replace man-db 2.4.4-4 (using .../man-db_2.5.0-2_amd64.deb) ...
+Preparing to replace libssl0.9.8 0.9.8e-9 (using .../libssl0.9.8_0.9.8f-1_amd64.deb) ...
+Unpacking replacement libssl0.9.8 ...
+Preparing to replace man-db 2.4.4-4 (using .../man-db_2.5.0-3_amd64.deb) ...
 Unpacking replacement man-db ...
-Preparing to replace traceroute 2.0.9~rc1-1 (using .../traceroute_2.0.9-1_amd64.deb) ...
-Unpacking replacement traceroute ...
-Preparing to replace dselect 1.14.6 (using .../dselect_1.14.7_amd64.deb) ...
-Unpacking replacement dselect ...
-Preparing to replace procps 1:3.2.7-4.1 (using .../procps_1%3a3.2.7-5_amd64.deb) ...
-Unpacking replacement procps ...
-Preparing to replace dpkg-dev 1.14.6 (using .../dpkg-dev_1.14.7_all.deb) ...
-Unpacking replacement dpkg-dev ...
-Setting up libdb4.6 (4.6.21-1) ...
-Setting up libc6-dev (2.6.1-5) ...
-Setting up libgomp1 (4.2.2-1) ...
-Setting up cpp-4.2 (4.2.2-1) ...
-Setting up gcc-4.2 (4.2.2-1) ...
-Setting up libncursesw5 (5.6+20071006-2) ...
-Setting up aptitude (0.4.6.1-1.1) ...
+Preparing to replace net-tools 1.60-17 (using .../net-tools_1.60-17.1_amd64.deb) ...
+Unpacking replacement net-tools ...
+Preparing to replace vim-tiny 1:7.1-056+2 (using .../vim-tiny_1%3a7.1-138+1_amd64.deb) ...
+Unpacking replacement vim-tiny ...
+Preparing to replace vim-common 1:7.1-056+2 (using .../vim-common_1%3a7.1-138+1_amd64.deb) ...
+Unpacking replacement vim-common ...
+Setting up libc6-dev (2.6.1-6) ...
+Setting up libgomp1 (4.2.2-3) ...
+Setting up cpp-4.2 (4.2.2-3) ...
+Setting up gcc-4.2 (4.2.2-3) ...
+Setting up libdb4.6 (4.6.21-3) ...
 Setting up laptop-detect (0.13.2) ...
+Setting up libncursesw5 (5.6+20071013-1) ...
 Setting up libsasl2-2 (2.1.22.dfsg1-15) ...
-Setting up man-db (2.5.0-2) ...
+Setting up libssl0.9.8 (0.9.8f-1) ...
+Setting up man-db (2.5.0-3) ...
 Installing new version of config file /etc/manpath.config ...
-Setting up traceroute (2.0.9-1) ...
-Setting up dselect (1.14.7) ...
-Setting up procps (1:3.2.7-5) ...
-Installing new version of config file /etc/sysctl.conf ...
-Setting up perl-modules (5.8.8-11) ...
-Setting up libstdc++6-4.2-dev (4.2.2-1) ...
-Setting up g++-4.2 (4.2.2-1) ...
-Setting up perl (5.8.8-11) ...
-Setting up dpkg-dev (1.14.7) ...
+Setting up net-tools (1.60-17.1) ...
+Setting up vim-common (1:7.1-138+1) ...
+Setting up vim-tiny (1:7.1-138+1) ...
+Setting up g++-4.2 (4.2.2-3) ...
+Setting up perl-modules (5.8.8-11.1) ...
+Setting up libstdc++6-4.2-dev (4.2.2-3) ...
+Setting up perl (5.8.8-11.1) ...
 Reading package lists...
 Building dependency tree...
 Reading state information...