1 files changed, 97 insertions, 95 deletions
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log b/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log
index 78fa51f..9a8752b 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log
@@ -13,7 +13,7 @@ Installing the build-deps
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
 Version: 0.invalid.0
-Architecture: i386
+Architecture: amd64
 Maintainer: Debian Pbuilder Team <pbuilder-maint@lists.alioth.debian.org>
 Description: Dummy package to satisfy dependencies with aptitude - created by pbuilder
  This package was created automatically by pbuilder and should
@@ -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 ... 11444 files and directories currently installed.)
+(Reading database ... 9628 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:
@@ -43,99 +43,101 @@ Building dependency tree...
 Reading state information...
 Initializing package states...
 Writing extended state information...
-Reading task descriptions...
 The following NEW packages will be installed:
-  debhelper{a} file{a} gettext{a} gettext-base{a} html2text{a} 
-  intltool-debian{a} libdshconfig1{a} libdshconfig1-dev{a} libmagic1{a} 
-  libsgmls-perl{a} libsp1c2{a} po-debconf{a} po4a{a} sp{a} 
+  bsdmainutils{a} debhelper{a} file{a} gettext{a} gettext-base{a} 
+  groff-base{a} html2text{a} intltool-debian{a} libdshconfig1{a} 
+  libdshconfig1-dev{a} libmagic1{a} libsgmls-perl{a} libsp1c2{a} man-db{a} 
+  po-debconf{a} po4a{a} sp{a} 
 The following partially installed packages will be configured:
   pbuilder-satisfydepends-dummy 
-0 packages upgraded, 14 newly installed, 0 to remove and 0 not upgraded.
-Need to get 6546kB of archives. After unpacking 19.6MB will be used.
+0 packages upgraded, 17 newly installed, 0 to remove and 0 not upgraded.
+Need to get 8922kB of archives. After unpacking 28.1MB will be used.
 Writing extended state information...
-Get:1 http://localhost lenny/main libmagic1 4.25-1 [367kB]
-Get:2 http://localhost lenny/main file 4.25-1 [44.0kB]
-Get:3 http://localhost lenny/main html2text 1.3.2a-5 [91.5kB]
-Get:4 http://localhost lenny/main gettext-base 0.17-3 [117kB]
-Get:5 http://localhost lenny/main gettext 0.17-3 [2672kB]
+Get:1 http://localhost lenny/main libmagic1 4.26-1 [369kB]
+Get:2 http://localhost lenny/main file 4.26-1 [44.5kB]
+Get:3 http://localhost lenny/main html2text 1.3.2a-5 [95.9kB]
+Get:4 http://localhost lenny/main gettext-base 0.17-4 [136kB]
+Get:5 http://localhost lenny/main gettext 0.17-4 [2791kB]
 Get:6 http://localhost lenny/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:7 http://localhost lenny/main po-debconf 1.0.15 [237kB]
-Get:8 http://localhost lenny/main debhelper 7.0.15 [554kB]
-Get:9 http://localhost lenny/main libdshconfig1 0.20.13-1 [10.7kB]
-Get:10 http://localhost lenny/main libdshconfig1-dev 0.20.13-1 [25.2kB]
-Get:11 http://localhost lenny/main libsgmls-perl 1.03ii-32 [27.8kB]
-Get:12 http://localhost lenny/main libsp1c2 1.3.4-1.2.1-47 [1345kB]
-Get:13 http://localhost lenny/main sp 1.3.4-1.2.1-47 [176kB]
-Get:14 http://localhost lenny/main po4a 0.34-2 [847kB]
+Get:8 http://localhost lenny/main groff-base 1.18.1.1-21 [898kB]
+Get:9 http://localhost lenny/main bsdmainutils 6.1.10 [179kB]
+Get:10 http://localhost lenny/main man-db 2.5.2-4 [1107kB]
+Get:11 http://localhost lenny/main debhelper 7.0.15 [554kB]
+Get:12 http://localhost lenny/main libdshconfig1 0.20.13-1 [11.0kB]
+Get:13 http://localhost lenny/main libdshconfig1-dev 0.20.13-1 [25.4kB]
+Get:14 http://localhost lenny/main libsgmls-perl 1.03ii-32 [27.8kB]
+Get:15 http://localhost lenny/main libsp1c2 1.3.4-1.2.1-47 [1386kB]
+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 ... 11444 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.25-1_i386.deb) ...
-Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.25-1_i386.deb) ...
-Selecting previously deselected package html2text.
-Unpacking html2text (from .../html2text_1.3.2a-5_i386.deb) ...
-Selecting previously deselected package gettext-base.
-Unpacking gettext-base (from .../gettext-base_0.17-3_i386.deb) ...
-Selecting previously deselected package gettext.
-Unpacking gettext (from .../gettext_0.17-3_i386.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 debhelper.
-Unpacking debhelper (from .../debhelper_7.0.15_all.deb) ...
-Selecting previously deselected package libdshconfig1.
-Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_i386.deb) ...
-Selecting previously deselected package libdshconfig1-dev.
-Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.13-1_i386.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_i386.deb) ...
-Selecting previously deselected package sp.
-Unpacking sp (from .../sp_1.3.4-1.2.1-47_i386.deb) ...
-Selecting previously deselected package po4a.
-Unpacking po4a (from .../archives/po4a_0.34-2_all.deb) ...
-Processing triggers for man-db ...
-Setting up libmagic1 (4.25-1) ...
-Setting up file (4.25-1) ...
-Setting up html2text (1.3.2a-5) ...
-Setting up gettext-base (0.17-3) ...
-Setting up gettext (0.17-3) ...
-Setting up intltool-debian (0.35.0+20060710.1) ...
-Setting up po-debconf (1.0.15) ...
-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 ... 9628 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...
 Reading extended state information...
 Initializing package states...
 Writing extended state information...
-Reading task descriptions...
  -> Finished parsing the build-deps
 Reading package lists...
 Building dependency tree...
 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 113kB of archives.
-After this operation, 365kB of additional disk space will be used.
-Get:1 http://localhost lenny/main fakeroot 1.9.5 [113kB]
-Fetched XXXB in Xs (XXXXXB/s)
-Selecting previously deselected package fakeroot.
-(Reading database ... 12510 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.9.5_i386.deb) ...
-Processing triggers for man-db ...
-Setting up fakeroot (1.9.5) ...
+fakeroot is already the newest version.
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Copying source file
     -> copying [/TESTDIR/dir1/dsh_0.25.10-1.dsc]
     -> copying [/TESTDIR/dir1/dsh_0.25.10.orig.tar.gz]
@@ -156,7 +158,7 @@ dpkg-buildpackage: set FFLAGS to default value: -g -O2
 dpkg-buildpackage: set CXXFLAGS to default value: -g -O2
 dpkg-buildpackage: source package dsh
 dpkg-buildpackage: source version 0.25.10-1
-dpkg-buildpackage: host architecture i386
+dpkg-buildpackage: host architecture amd64
  fakeroot debian/rules clean
 dh_testdir
 dh_testroot
@@ -217,8 +219,8 @@ checking for grep that handles long lines and -e... /bin/grep
 checking for egrep... /bin/grep -E
 checking for ANSI C header files... yes
 checking for sys/wait.h that is POSIX.1 compatible... yes
-checking build system type... i686-pc-linux-gnu
-checking host system type... i686-pc-linux-gnu
+checking build system type... x86_64-unknown-linux-gnu
+checking host system type... x86_64-unknown-linux-gnu
 checking for a sed that does not truncate output... /bin/sed
 checking for ld used by gcc... /usr/bin/ld
 checking if the linker (/usr/bin/ld) is GNU ld... yes
@@ -281,7 +283,7 @@ checking for gcc option to produce PIC... -fPIC
 checking if gcc PIC flag -fPIC works... yes
 checking if gcc static flag -static works... yes
 checking if gcc supports -c -o file.o... yes
-checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes
+checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
 checking whether -lc should be explicitly linked in... no
 checking dynamic linker characteristics... GNU/Linux ld.so
 checking how to hardcode library paths into programs... immediate
@@ -291,14 +293,14 @@ checking whether to build shared libraries... yes
 checking whether to build static libraries... yes
 configure: creating libtool
 appending configuration tag "CXX" to libtool
-checking for ld used by g++... /usr/bin/ld
-checking if the linker (/usr/bin/ld) is GNU ld... yes
-checking whether the g++ linker (/usr/bin/ld) supports shared libraries... yes
+checking for ld used by g++... /usr/bin/ld -m elf_x86_64
+checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes
+checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
 checking for g++ option to produce PIC... -fPIC
 checking if g++ PIC flag -fPIC works... yes
 checking if g++ static flag -static works... yes
 checking if g++ supports -c -o file.o... yes
-checking whether the g++ linker (/usr/bin/ld) supports shared libraries... yes
+checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
 checking dynamic linker characteristics... GNU/Linux ld.so
 checking how to hardcode library paths into programs... immediate
 appending configuration tag "F77" to libtool
@@ -307,8 +309,8 @@ checking for msgfmt... /usr/bin/msgfmt
 checking for gmsgfmt... /usr/bin/msgfmt
 checking for xgettext... /usr/bin/xgettext
 checking for msgmerge... /usr/bin/msgmerge
-checking for ld used by GCC... /usr/bin/ld
-checking if the linker (/usr/bin/ld) is GNU ld... yes
+checking for ld used by GCC... /usr/bin/ld -m elf_x86_64
+checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes
 checking for shared library run path origin... done
 checking whether NLS is requested... yes
 checking for GNU gettext in libc... yes
@@ -444,9 +446,9 @@ 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
+b: 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
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -459,7 +461,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Mon Aug 11 16:29:12 UTC 2008
+Fri Feb 20 04:24:18 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
@@ -529,14 +531,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Mon Aug 11 16:29:17 UTC 2008
+Fri Feb 20 04:24:23 UTC 2009
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-dsh: Process terminated (before write).
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -623,8 +625,8 @@ dh_installdeb
 dh_gencontrol
 dh_md5sums
 dh_builddeb
-dpkg-deb: building package `dsh' in `../dsh_0.25.10-1_i386.deb'.
- dpkg-genchanges -mJunichi Uekawa <dancer@debian.org> >../dsh_0.25.10-1_i386.changes
+dpkg-deb: building package `dsh' in `../dsh_0.25.10-1_amd64.deb'.
+ dpkg-genchanges -mJunichi Uekawa <dancer@debian.org> >../dsh_0.25.10-1_amd64.changes
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem