--resolve-deps is now default in debootstrap;

update.

1 files changed, 57 insertions, 55 deletions

diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
index a75add0..c064f23 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
@@ -1,6 +1,6 @@
 Upgrading for distribution etch
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.uiwnkH/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.EXa4vQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -11,7 +11,7 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://ftp.jp.debian.org etch/main Packages [3368kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3368kB in 1s (1744kB/s)
+Fetched 3368kB in 1s (1828kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -39,10 +39,9 @@ The following packages will be upgraded:
   module-init-tools modutils mount nano ncurses-base ncurses-bin net-tools
   netbase netkit-inetd passwd perl perl-base perl-modules procps psmisc sysv-rc
   sysvinit tasksel telnet util-linux wget whiptail zlib1g
-Preconfiguring packages ...
 107 upgraded, 17 newly installed, 1 to remove and 0 not upgraded.
-Need to get 0B/58.9MB of archives.
-After unpacking 31.3MB of additional disk space will be used.
+Need to get 0B/59.0MB of archives.
+After unpacking 31.5MB of additional disk space will be used.
 (Reading database ... 10733 files and directories currently installed.)
 Preparing to replace linux-kernel-headers 2.5.999-test7-bk-17 (using .../linux-kernel-headers_2.6.13+0rc3-1.1_amd64.deb) ...
 Unpacking replacement linux-kernel-headers ...
@@ -73,8 +72,8 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-6) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Mon Oct 24 04:42:28 UTC 2005.
-Universal Time is now:  Mon Oct 24 04:42:28 UTC 2005.
+Local time is now:      Tue Oct 25 03:28:25 UTC 2005.
+Universal Time is now:  Tue Oct 25 03:28:25 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 10830 files and directories currently installed.)
@@ -127,6 +126,12 @@ Installing new version of config file /etc/issue.net ...
 Installing new version of config file /etc/nsswitch.conf ...
 
 (Reading database ... 10840 files and directories currently installed.)
+Preparing to replace debianutils 2.8.4 (using .../debianutils_2.15_amd64.deb) ...
+Unpacking replacement debianutils ...
+Replacing files in old package passwd ...
+Setting up debianutils (2.15) ...
+
+(Reading database ... 10851 files and directories currently installed.)
 Preparing to replace libgpg-error0 1.0-1 (using .../libgpg-error0_1.1-4_amd64.deb) ...
 Unpacking replacement libgpg-error0 ...
 Preparing to replace libgcrypt11 1.2.0-11.1 (using .../libgcrypt11_1.2.1-4_amd64.deb) ...
@@ -135,7 +140,7 @@ Preparing to replace zlib1g 1:1.2.2-4 (using .../zlib1g_1%3a1.2.3-4_amd64.deb) .
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-4) ...
 
-(Reading database ... 10840 files and directories currently installed.)
+(Reading database ... 10851 files and directories currently installed.)
 Preparing to replace libopencdk8 0.5.5-10 (using .../libopencdk8_0.5.7-2_amd64.deb) ...
 Unpacking replacement libopencdk8 ...
 Preparing to replace libtasn1-2 0.2.10-3 (using .../libtasn1-2_0.2.13-1_amd64.deb) ...
@@ -152,23 +157,18 @@ Selecting previously deselected package libselinux1.
 Unpacking libselinux1 (from .../libselinux1_1.26-1_amd64.deb) ...
 Setting up libselinux1 (1.26-1) ...
 
-(Reading database ... 10865 files and directories currently installed.)
+(Reading database ... 10876 files and directories currently installed.)
 Preparing to replace libpam-runtime 0.76-22 (using .../libpam-runtime_0.79-3_all.deb) ...
 Unpacking replacement libpam-runtime ...
 Setting up libpam-runtime (0.79-3) ...
 Installing new version of config file /etc/pam.conf ...
 
-(Reading database ... 10865 files and directories currently installed.)
+(Reading database ... 10876 files and directories currently installed.)
 Preparing to replace libpam0g 0.76-22 (using .../libpam0g_0.79-3_amd64.deb) ...
 Unpacking replacement libpam0g ...
 Setting up libpam0g (0.79-3) ...
 
-(Reading database ... 10865 files and directories currently installed.)
-Preparing to replace debianutils 2.8.4 (using .../debianutils_2.14.3_amd64.deb) ...
-Unpacking replacement debianutils ...
-Setting up debianutils (2.14.3) ...
-
-(Reading database ... 10875 files and directories currently installed.)
+(Reading database ... 10876 files and directories currently installed.)
 Preparing to replace perl-modules 5.8.4-8 (using .../perl-modules_5.8.7-6_all.deb) ...
 Unpacking replacement perl-modules ...
 Preparing to replace perl 5.8.4-8 (using .../perl_5.8.7-6_amd64.deb) ...
@@ -176,7 +176,7 @@ Unpacking replacement perl ...
 Preparing to replace perl-base 5.8.4-8 (using .../perl-base_5.8.7-6_amd64.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.7-6) ...
-(Reading database ... 11133 files and directories currently installed.)
+(Reading database ... 11134 files and directories currently installed.)
 Preparing to replace liblocale-gettext-perl 1.01-17 (using .../liblocale-gettext-perl_1.05-1_amd64.deb) ...
 Unpacking replacement liblocale-gettext-perl ...
 Preparing to replace libtext-iconv-perl 1.2-3 (using .../libtext-iconv-perl_1.4-2_amd64.deb) ...
@@ -199,7 +199,7 @@ Preparing to replace ncurses-bin 5.4-4 (using .../ncurses-bin_5.4-9_amd64.deb) .
 Unpacking replacement ncurses-bin ...
 Setting up ncurses-bin (5.4-9) ...
 Selecting previously deselected package lsb-base.
-(Reading database ... 11152 files and directories currently installed.)
+(Reading database ... 11153 files and directories currently installed.)
 Unpacking lsb-base (from .../lsb-base_3.0-9_all.deb) ...
 Preparing to replace netkit-inetd 0.10-10 (using .../netkit-inetd_0.10-10.2_amd64.deb) ...
 Unpacking replacement netkit-inetd ...
@@ -217,39 +217,41 @@ Installing new version of config file /etc/security/access.conf ...
 Installing new version of config file /etc/security/pam_env.conf ...
 Installing new version of config file /etc/security/limits.conf ...
 
-(Reading database ... 11170 files and directories currently installed.)
-Preparing to replace login 1:4.0.3-31sarge5 (using .../login_1%3a4.0.12-6_amd64.deb) ...
+(Reading database ... 11171 files and directories currently installed.)
+Preparing to replace login 1:4.0.3-31sarge5 (using .../login_1%3a4.0.13-1_amd64.deb) ...
 Unpacking replacement login ...
-Setting up login (4.0.12-6) ...
+Setting up login (4.0.13-1) ...
 Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11178 files and directories currently installed.)
-Preparing to replace passwd 1:4.0.3-31sarge5 (using .../passwd_1%3a4.0.12-6_amd64.deb) ...
+(Reading database ... 11180 files and directories currently installed.)
+Preparing to replace passwd 1:4.0.3-31sarge5 (using .../passwd_1%3a4.0.13-1_amd64.deb) ...
 Unpacking replacement passwd ...
-Setting up passwd (4.0.12-6) ...
+Setting up passwd (4.0.13-1) ...
+Installing new version of config file /etc/pam.d/chfn ...
+Installing new version of config file /etc/pam.d/chsh ...
 
-(Reading database ... 11204 files and directories currently installed.)
-Preparing to replace bash 2.05b-26 (using .../archives/bash_3.0-16_amd64.deb) ...
+(Reading database ... 11206 files and directories currently installed.)
+Preparing to replace bash 2.05b-26 (using .../archives/bash_3.0-17_amd64.deb) ...
 Unpacking replacement bash ...
-Setting up bash (3.0-16) ...
+Setting up bash (3.0-17) ...
 Installing new version of config file /etc/skel/.bashrc ...
 Installing new version of config file /etc/skel/.bash_profile ...
 Installing new version of config file /etc/bash.bashrc ...
 Installing new version of config file /etc/bash_completion ...
 
-(Reading database ... 11208 files and directories currently installed.)
+(Reading database ... 11210 files and directories currently installed.)
 Preparing to replace bsdutils 1:2.12p-4 (using .../bsdutils_1%3a2.12p-8_amd64.deb) ...
 Unpacking replacement bsdutils ...
 Setting up bsdutils (2.12p-8) ...
 
-(Reading database ... 11208 files and directories currently installed.)
+(Reading database ... 11210 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2 (using .../coreutils_5.2.1-2.1_amd64.deb) ...
 Unpacking replacement coreutils ...
 Setting up coreutils (5.2.1-2.1) ...
 
-(Reading database ... 11207 files and directories currently installed.)
+(Reading database ... 11209 files and directories currently installed.)
 Preparing to replace dpkg 1.10.28 (using .../dpkg_1.13.11_amd64.deb) ...
 Unpacking replacement dpkg ...
 Setting up dpkg (1.13.11) ...
@@ -263,63 +265,63 @@ Installing new version of config file /etc/dpkg/origins/debian ...
 Adding `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
 Adding `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 
-(Reading database ... 11206 files and directories currently installed.)
+(Reading database ... 11208 files and directories currently installed.)
 Preparing to replace e2fslibs 1.37-2sarge1 (using .../e2fslibs_1.38-2_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.38-2) ...
 
-(Reading database ... 11206 files and directories currently installed.)
+(Reading database ... 11208 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.37-2sarge1 (using .../e2fsprogs_1.38-2_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Setting up e2fsprogs (1.38-2) ...
-(Reading database ... 11210 files and directories currently installed.)
+(Reading database ... 11212 files and directories currently installed.)
 Preparing to replace findutils 4.1.20-6 (using .../findutils_4.2.25-1_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.25-1) ...
 Installing new version of config file /etc/updatedb.conf ...
 
-(Reading database ... 11230 files and directories currently installed.)
+(Reading database ... 11232 files and directories currently installed.)
 Preparing to replace grep 2.5.1.ds1-4 (using .../grep_2.5.1.ds2-1_amd64.deb) ...
 Unpacking replacement grep ...
 Setting up grep (2.5.1.ds2-1) ...
-(Reading database ... 11229 files and directories currently installed.)
+(Reading database ... 11231 files and directories currently installed.)
 Preparing to replace gzip 1.3.5-10 (using .../gzip_1.3.5-12_amd64.deb) ...
 Unpacking replacement gzip ...
 Setting up gzip (1.3.5-12) ...
 
-(Reading database ... 11229 files and directories currently installed.)
+(Reading database ... 11231 files and directories currently installed.)
 Preparing to replace hostname 2.13 (using .../hostname_2.91_amd64.deb) ...
 Unpacking replacement hostname ...
 Setting up hostname (2.91) ...
-(Reading database ... 11229 files and directories currently installed.)
+(Reading database ... 11231 files and directories currently installed.)
 Preparing to replace mount 2.12p-4 (using .../mount_2.12p-8_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.12p-8) ...
 
 Selecting previously deselected package libsepol1.
-(Reading database ... 11229 files and directories currently installed.)
+(Reading database ... 11231 files and directories currently installed.)
 Unpacking libsepol1 (from .../libsepol1_1.8-1_amd64.deb) ...
 Setting up libsepol1 (1.8-1) ...
 
-(Reading database ... 11234 files and directories currently installed.)
+(Reading database ... 11236 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-4_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-4) ...
 init: timeout opening/writing control channel /dev/initctl
 
 Selecting previously deselected package libslang2.
-(Reading database ... 11234 files and directories currently installed.)
+(Reading database ... 11236 files and directories currently installed.)
 Unpacking libslang2 (from .../libslang2_2.0.4-7_amd64.deb) ...
 Setting up libslang2 (2.0.4-7) ...
 
-(Reading database ... 11246 files and directories currently installed.)
+(Reading database ... 11248 files and directories currently installed.)
 Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12p-8_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12p-8) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11246 files and directories currently installed.)
+(Reading database ... 11248 files and directories currently installed.)
 Preparing to replace ncurses-base 5.4-4 (using .../ncurses-base_5.4-9_all.deb) ...
 Removing obsolete conffile /etc/terminfo/E/Eterm ...
 Removing obsolete conffile /etc/terminfo/E/Eterm-color ...
@@ -357,7 +359,7 @@ Removing obsolete conffile /etc/terminfo/x/xterm-vt220 ...
 Removing obsolete conffile /etc/terminfo/x/xterm-color ...
 Unpacking replacement ncurses-base ...
 Setting up ncurses-base (5.4-9) ...
-(Reading database ... 11250 files and directories currently installed.)
+(Reading database ... 11252 files and directories currently installed.)
 Preparing to replace console-tools 1:0.2.3dbs-56 (using .../console-tools_1%3a0.2.3dbs-57_amd64.deb) ...
 Unpacking replacement console-tools ...
 Preparing to replace libconsole 1:0.2.3dbs-56 (using .../libconsole_1%3a0.2.3dbs-57_amd64.deb) ...
@@ -369,14 +371,14 @@ Setting up libtext-wrapi18n-perl (0.06-3) ...
 Setting up debconf-i18n (1.4.58) ...
 Setting up debconf (1.4.58) ...
 
-(Reading database ... 11250 files and directories currently installed.)
+(Reading database ... 11252 files and directories currently installed.)
 Preparing to replace console-common 0.7.49 (using .../console-common_0.7.54_all.deb) ...
 Unpacking replacement console-common ...
 Preparing to replace dselect 1.10.28 (using .../dselect_1.13.11_amd64.deb) ...
 Unpacking replacement dselect ...
 Setting up dselect (1.13.11) ...
 Installing new version of config file /etc/dpkg/dselect.cfg ...
-(Reading database ... 11255 files and directories currently installed.)
+(Reading database ... 11257 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-4_amd64.deb) ...
 Unpacking replacement initscripts ...
 Setting up lsb-base (3.0-9) ...
@@ -400,7 +402,7 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/urandom ...
 Installing new version of config file /etc/default/tmpfs ...
 
-(Reading database ... 11256 files and directories currently installed.)
+(Reading database ... 11258 files and directories currently installed.)
 Preparing to replace libattr1 2.4.16-1 (using .../libattr1_2.4.25-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.23-1 (using .../libacl1_2.2.32-1_amd64.deb) ...
@@ -409,32 +411,32 @@ Setting up libattr1 (2.4.25-1) ...
 
 Setting up libacl1 (2.2.32-1) ...
 
-(Reading database ... 11256 files and directories currently installed.)
+(Reading database ... 11258 files and directories currently installed.)
 Preparing to replace libblkid1 1.37-2sarge1 (using .../libblkid1_1.38-2_amd64.deb) ...
 Unpacking replacement libblkid1 ...
 Setting up libblkid1 (1.38-2) ...
 
-(Reading database ... 11256 files and directories currently installed.)
+(Reading database ... 11258 files and directories currently installed.)
 Preparing to replace libcomerr2 1.37-2sarge1 (using .../libcomerr2_1.38-2_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.38-2) ...
 
-(Reading database ... 11256 files and directories currently installed.)
+(Reading database ... 11258 files and directories currently installed.)
 Preparing to replace libss2 1.37-2sarge1 (using .../libss2_1.38-2_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.38-2) ...
 
-(Reading database ... 11256 files and directories currently installed.)
+(Reading database ... 11258 files and directories currently installed.)
 Preparing to replace libuuid1 1.37-2sarge1 (using .../libuuid1_1.38-2_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.38-2) ...
 
-(Reading database ... 11256 files and directories currently installed.)
+(Reading database ... 11258 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-4_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-4) ...
 
-(Reading database ... 11256 files and directories currently installed.)
+(Reading database ... 11258 files and directories currently installed.)
 Preparing to replace binutils 2.15-6 (using .../binutils_2.16.1-2_amd64.deb) ...
 Unpacking replacement binutils ...
 Preparing to replace libstdc++5-3.3-dev 1:3.3.5-13 (using .../libstdc++5-3.3-dev_1%3a3.3.6-7_amd64.deb) ...
@@ -453,7 +455,7 @@ Setting up gcc-3.3-base (3.3.6-7) ...
 Setting up libstdc++5 (3.3.6-7) ...
 
 Selecting previously deselected package dmidecode.
-(Reading database ... 11264 files and directories currently installed.)
+(Reading database ... 11266 files and directories currently installed.)
 Unpacking dmidecode (from .../dmidecode_2.7-2_amd64.deb) ...
 Selecting previously deselected package laptop-detect.
 Unpacking laptop-detect (from .../laptop-detect_0.12.1_amd64.deb) ...
@@ -702,6 +704,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.uiwnkH/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.EXa4vQ/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//13737 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//15537 and its subdirectories