test update

17 files changed, 1815 insertions, 1623 deletions

diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index f80fe3f..5ca812d 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -15,24 +15,26 @@ dpkg-architecture: warning: no utmp entry available and LOGNAME not defined; usi
    -> Trying debhelper
  -> Considering build-dep libdshconfig1-dev (>= 0.20.11-1)
    -> Trying libdshconfig1-dev
- -> Installing  debhelper libdshconfig1-dev
+ -> Considering build-dep po4a
+   -> Trying po4a
+ -> Installing  debhelper libdshconfig1-dev po4a
 Reading package lists...
 Building dependency tree...
 The following extra packages will be installed:
   file gettext gettext-base html2text intltool-debian libdshconfig1 libmagic1
-  po-debconf
+  libsgmls-perl libsp1c2 po-debconf sp
 Suggested packages:
-  dh-make cvs gettext-doc
+  dh-make cvs gettext-doc sgmlspl sgmls-doc doc-base sgml-data
 Recommended packages:
-  libmail-sendmail-perl libcompress-zlib-perl
+  libmail-sendmail-perl libcompress-zlib-perl libterm-readkey-perl
 The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
-  libdshconfig1-dev libmagic1 po-debconf
-0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3482kB of archives.
-After unpacking 11.9MB of additional disk space will be used.
-Get:1 http://cdn.debian.or.jp etch/main libmagic1 4.17-5etch1 [276kB]
-Get:2 http://cdn.debian.or.jp etch/main file 4.17-5etch1 [32.1kB]
+  libdshconfig1-dev libmagic1 libsgmls-perl libsp1c2 po-debconf po4a sp
+0 upgraded, 14 newly installed, 0 to remove and 0 not upgraded.
+Need to get 5775kB of archives.
+After unpacking 19.3MB of additional disk space will be used.
+Get:1 http://cdn.debian.or.jp etch/main libmagic1 4.17-5etch2 [276kB]
+Get:2 http://cdn.debian.or.jp etch/main file 4.17-5etch2 [32.2kB]
 Get:3 http://cdn.debian.or.jp etch/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://cdn.debian.or.jp etch/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://cdn.debian.or.jp etch/main gettext 0.16.1-1 [2261kB]
@@ -41,12 +43,16 @@ Get:7 http://cdn.debian.or.jp etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp etch/main debhelper 5.0.42 [510kB]
 Get:9 http://cdn.debian.or.jp etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
+Get:11 http://cdn.debian.or.jp etch/main libsgmls-perl 1.03ii-31 [29.3kB]
+Get:12 http://cdn.debian.or.jp etch/main libsp1c2 1.3.4-1.2.1-47 [1386kB]
+Get:13 http://cdn.debian.or.jp etch/main sp 1.3.4-1.2.1-47 [182kB]
+Get:14 http://cdn.debian.or.jp etch/main po4a 0.29-1 [695kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12033 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.17-5etch1_amd64.deb) ...
+Unpacking libmagic1 (from .../libmagic1_4.17-5etch2_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../file_4.17-5etch1_amd64.deb) ...
+Unpacking file (from .../file_4.17-5etch2_amd64.deb) ...
 Selecting previously deselected package gettext-base.
 Unpacking gettext-base (from .../gettext-base_0.16.1-1_amd64.deb) ...
 Selecting previously deselected package html2text.
@@ -63,9 +69,17 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
-Setting up libmagic1 (4.17-5etch1) ...
+Selecting previously deselected package libsgmls-perl.
+Unpacking libsgmls-perl (from .../libsgmls-perl_1.03ii-31_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.29-1_all.deb) ...
+Setting up libmagic1 (4.17-5etch2) ...
 
-Setting up file (4.17-5etch1) ...
+Setting up file (4.17-5etch2) ...
 Setting up gettext-base (0.16.1-1) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -78,6 +92,12 @@ Setting up debhelper (5.0.42) ...
 Setting up libdshconfig1 (0.20.12-2) ...
 
 Setting up libdshconfig1-dev (0.20.12-2) ...
+Setting up libsgmls-perl (1.03ii-31) ...
+Setting up libsp1c2 (1.3.4-1.2.1-47) ...
+
+Setting up sp (1.3.4-1.2.1-47) ...
+
+Setting up po4a (0.29-1) ...
  -> Finished parsing the build-deps
 Reading package lists...
 Building dependency tree...
@@ -89,47 +109,47 @@ After unpacking 406kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp etch/main fakeroot 1.5.10 [97.4kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12703 files and directories currently installed.)
+(Reading database ... 12959 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
 Copying source file
-    -> copying [/TESTDIR/dir1/dsh_0.25.8-1.dsc]
-    -> copying [/TESTDIR/dir1/dsh_0.25.8.orig.tar.gz]
-    -> copying [/TESTDIR/dir1/dsh_0.25.8-1.diff.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.9-1.dsc]
+    -> copying [/TESTDIR/dir1/dsh_0.25.9.orig.tar.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.9-1.diff.gz]
 Extracting source
 gpg: can't open `/gnupg/options.skel': No such file or directory
-gpg: Signature made Fri May 18 11:19:27 2007 UTC using DSA key ID E81E55C1
+gpg: Signature made Wed Aug 15 00:10:09 2007 UTC using DSA key ID E81E55C1
 gpg: Can't check signature: public key not found
-dpkg-source: extracting dsh in dsh-0.25.8
-dpkg-source: unpacking dsh_0.25.8.orig.tar.gz
-dpkg-source: applying ./dsh_0.25.8-1.diff.gz
+dpkg-source: extracting dsh in dsh-0.25.9
+dpkg-source: unpacking dsh_0.25.9.orig.tar.gz
+dpkg-source: applying ./dsh_0.25.9-1.diff.gz
  -> Building the package
 dpkg-buildpackage: source package is dsh
-dpkg-buildpackage: source version is 0.25.8-1
+dpkg-buildpackage: source version is 0.25.9-1
 dpkg-buildpackage: host architecture amd64
-dpkg-buildpackage: source version without epoch 0.25.8-1
+dpkg-buildpackage: source version without epoch 0.25.9-1
  fakeroot debian/rules clean
 dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 dh_clean
- dpkg-source -b dsh-0.25.8
-dpkg-source: building dsh using existing dsh_0.25.8.orig.tar.gz
-dpkg-source: building dsh in dsh_0.25.8-1.diff.gz
+ dpkg-source -b dsh-0.25.9
+dpkg-source: building dsh using existing dsh_0.25.9.orig.tar.gz
+dpkg-source: building dsh in dsh_0.25.9-1.diff.gz
 dpkg-source: warning: file debian/compat has no final newline (either original or modified version)
 dpkg-source: warning: file dcp.sh has no final newline (either original or modified version)
-dpkg-source: building dsh in dsh_0.25.8-1.dsc
+dpkg-source: building dsh in dsh_0.25.9-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
@@ -176,7 +196,7 @@ checking if the linker (/usr/bin/ld) is GNU ld... yes
 checking for /usr/bin/ld option to reload object files... -r
 checking for BSD-compatible nm... /usr/bin/nm -B
 checking whether ln -s works... yes
-checking how to recognise dependent libraries... pass_all
+checking how to recognize dependent libraries... pass_all
 checking for sys/types.h... yes
 checking for sys/stat.h... yes
 checking for stdlib.h... yes
@@ -221,7 +241,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... 32768
+checking the maximum length of command line arguments... 98304
 checking command to parse /usr/bin/nm -B output from gcc object... ok
 checking for objdir... .libs
 checking for ar... ar
@@ -316,18 +336,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making all in m4
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making all in po
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -336,30 +356,30 @@ if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDL
 	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --tag=CC --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
-gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
+gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so  
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make check
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making check in m4
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making check in po
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  dsh
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -410,7 +430,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
-Wed Aug  1 03:08:41 UTC 2007
+Fri Aug 17 03:09:57 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -480,14 +500,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
-Wed Aug  1 03:08:46 UTC 2007
+Fri Aug 17 03:10:02 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 c: c
 dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -496,9 +516,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -506,58 +526,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/tmp/buildd/dsh-0.25.8/debian/dsh
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+/usr/bin/make install DESTDIR=/tmp/buildd/dsh-0.25.9/debian/dsh
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making install in m4
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making install in po
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/gettext/po/$file; \
+			    /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
-test -z "/usr/bin" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
+test -z "/usr/bin" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-cp /tmp/buildd/dsh-0.25.8/debian/machines.list /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/machines.list
-cp /tmp/buildd/dsh-0.25.8/dsh.conf /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/group/all
-install -d /tmp/buildd/dsh-0.25.8/debian/dsh/usr/lib/update-cluster
-install -m 755 /tmp/buildd/dsh-0.25.8/debian/dsh.updatelist /tmp/buildd/dsh-0.25.8/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+cp /tmp/buildd/dsh-0.25.9/debian/machines.list /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/machines.list
+cp /tmp/buildd/dsh-0.25.9/dsh.conf /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/group/all
+install -d /tmp/buildd/dsh-0.25.9/debian/dsh/usr/lib/update-cluster
+install -m 755 /tmp/buildd/dsh-0.25.9/debian/dsh.updatelist /tmp/buildd/dsh-0.25.9/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -574,7 +594,7 @@ dh_installdeb
 dh_gencontrol
 dh_md5sums
 dh_builddeb
-dpkg-deb: building package `dsh' in `../dsh_0.25.8-1_amd64.deb'.
+dpkg-deb: building package `dsh' in `../dsh_0.25.9-1_amd64.deb'.
  dpkg-genchanges -mJunichi Uekawa <dancer@debian.org>
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
diff --git a/testsuite/normal/pbuilder-build-dsh-lenny.log b/testsuite/normal/pbuilder-build-dsh-lenny.log
index 160ff57..a019044 100644
--- a/testsuite/normal/pbuilder-build-dsh-lenny.log
+++ b/testsuite/normal/pbuilder-build-dsh-lenny.log
@@ -14,45 +14,51 @@ Installing the build-deps
    -> Trying debhelper
  -> Considering build-dep libdshconfig1-dev (>= 0.20.11-1)
    -> Trying libdshconfig1-dev
- -> Installing  debhelper libdshconfig1-dev
+ -> Considering build-dep po4a
+   -> Trying po4a
+ -> Installing  debhelper libdshconfig1-dev po4a
 Reading package lists...
 Building dependency tree...
 Reading state information...
 The following extra packages will be installed:
   file gettext gettext-base html2text intltool-debian libdshconfig1 libmagic1
-  po-debconf
+  libsgmls-perl libsp1c2 po-debconf sp
 Suggested packages:
-  dh-make cvs gettext-doc
+  dh-make cvs gettext-doc sgmlspl sgmls-doc doc-base sgml-data
 Recommended packages:
-  libmail-sendmail-perl libcompress-zlib-perl
+  libmail-sendmail-perl libcompress-zlib-perl libterm-readkey-perl
 The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
-  libdshconfig1-dev libmagic1 po-debconf
-0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3562kB of archives.
-After unpacking 12.1MB of additional disk space will be used.
+  libdshconfig1-dev libmagic1 libsgmls-perl libsp1c2 po-debconf po4a sp
+0 upgraded, 14 newly installed, 0 to remove and 0 not upgraded.
+Need to get 5888kB of archives.
+After unpacking 19.3MB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main libmagic1 4.21-2 [332kB]
 Get:2 http://cdn.debian.or.jp lenny/main file 4.21-2 [40.0kB]
-Get:3 http://cdn.debian.or.jp lenny/main gettext-base 0.16.1-1 [132kB]
+Get:3 http://cdn.debian.or.jp lenny/main gettext-base 0.16.1-2 [133kB]
 Get:4 http://cdn.debian.or.jp lenny/main html2text 1.3.2a-3 [92.7kB]
-Get:5 http://cdn.debian.or.jp lenny/main gettext 0.16.1-1 [2261kB]
+Get:5 http://cdn.debian.or.jp lenny/main gettext 0.16.1-2 [2269kB]
 Get:6 http://cdn.debian.or.jp lenny/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:7 http://cdn.debian.or.jp lenny/main po-debconf 1.0.9 [117kB]
 Get:8 http://cdn.debian.or.jp lenny/main debhelper 5.0.53 [520kB]
 Get:9 http://cdn.debian.or.jp lenny/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp lenny/main libdshconfig1-dev 0.20.12-2 [25.3kB]
+Get:11 http://cdn.debian.or.jp lenny/main libsgmls-perl 1.03ii-31 [29.3kB]
+Get:12 http://cdn.debian.or.jp lenny/main libsp1c2 1.3.4-1.2.1-47 [1386kB]
+Get:13 http://cdn.debian.or.jp lenny/main sp 1.3.4-1.2.1-47 [182kB]
+Get:14 http://cdn.debian.or.jp lenny/main po4a 0.31-1 [720kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11050 files and directories currently installed.)
+(Reading database ... 11043 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.21-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.21-2_amd64.deb) ...
 Selecting previously deselected package gettext-base.
-Unpacking gettext-base (from .../gettext-base_0.16.1-1_amd64.deb) ...
+Unpacking gettext-base (from .../gettext-base_0.16.1-2_amd64.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
-Unpacking gettext (from .../gettext_0.16.1-1_amd64.deb) ...
+Unpacking gettext (from .../gettext_0.16.1-2_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.
@@ -63,14 +69,22 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
+Selecting previously deselected package libsgmls-perl.
+Unpacking libsgmls-perl (from .../libsgmls-perl_1.03ii-31_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.31-1_all.deb) ...
 Setting up libmagic1 (4.21-2) ...
 
 Setting up file (4.21-2) ...
-Setting up gettext-base (0.16.1-1) ...
+Setting up gettext-base (0.16.1-2) ...
 
 Setting up html2text (1.3.2a-3) ...
 
-Setting up gettext (0.16.1-1) ...
+Setting up gettext (0.16.1-2) ...
 
 Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.9) ...
@@ -78,6 +92,12 @@ Setting up debhelper (5.0.53) ...
 Setting up libdshconfig1 (0.20.12-2) ...
 
 Setting up libdshconfig1-dev (0.20.12-2) ...
+Setting up libsgmls-perl (1.03ii-31) ...
+Setting up libsp1c2 (1.3.4-1.2.1-47) ...
+
+Setting up sp (1.3.4-1.2.1-47) ...
+
+Setting up po4a (0.31-1) ...
  -> Finished parsing the build-deps
 Reading package lists...
 Building dependency tree...
@@ -90,47 +110,47 @@ After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main fakeroot 1.7.1 [111kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11730 files and directories currently installed.)
+(Reading database ... 11985 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
 Copying source file
-    -> copying [/TESTDIR/dir1/dsh_0.25.8-1.dsc]
-    -> copying [/TESTDIR/dir1/dsh_0.25.8.orig.tar.gz]
-    -> copying [/TESTDIR/dir1/dsh_0.25.8-1.diff.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.9-1.dsc]
+    -> copying [/TESTDIR/dir1/dsh_0.25.9.orig.tar.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.9-1.diff.gz]
 Extracting source
 gpg: can't open `/gnupg/options.skel': No such file or directory
-gpg: Signature made Fri May 18 11:19:27 2007 UTC using DSA key ID E81E55C1
+gpg: Signature made Wed Aug 15 00:10:09 2007 UTC using DSA key ID E81E55C1
 gpg: Can't check signature: public key not found
-dpkg-source: extracting dsh in dsh-0.25.8
-dpkg-source: unpacking dsh_0.25.8.orig.tar.gz
-dpkg-source: applying ./dsh_0.25.8-1.diff.gz
+dpkg-source: extracting dsh in dsh-0.25.9
+dpkg-source: unpacking dsh_0.25.9.orig.tar.gz
+dpkg-source: applying ./dsh_0.25.9-1.diff.gz
  -> Building the package
 dpkg-buildpackage: source package is dsh
-dpkg-buildpackage: source version is 0.25.8-1
+dpkg-buildpackage: source version is 0.25.9-1
 dpkg-buildpackage: host architecture amd64
-dpkg-buildpackage: source version without epoch 0.25.8-1
+dpkg-buildpackage: source version without epoch 0.25.9-1
  fakeroot debian/rules clean
 dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 dh_clean
- dpkg-source -b dsh-0.25.8
-dpkg-source: building dsh using existing dsh_0.25.8.orig.tar.gz
-dpkg-source: building dsh in dsh_0.25.8-1.diff.gz
+ dpkg-source -b dsh-0.25.9
+dpkg-source: building dsh using existing dsh_0.25.9.orig.tar.gz
+dpkg-source: building dsh in dsh_0.25.9-1.diff.gz
 dpkg-source: warning: file debian/compat has no final newline (either original or modified version)
 dpkg-source: warning: file dcp.sh has no final newline (either original or modified version)
-dpkg-source: building dsh in dsh_0.25.8-1.dsc
+dpkg-source: building dsh in dsh_0.25.9-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
@@ -177,7 +197,7 @@ checking if the linker (/usr/bin/ld) is GNU ld... yes
 checking for /usr/bin/ld option to reload object files... -r
 checking for BSD-compatible nm... /usr/bin/nm -B
 checking whether ln -s works... yes
-checking how to recognise dependent libraries... pass_all
+checking how to recognize dependent libraries... pass_all
 checking for sys/types.h... yes
 checking for sys/stat.h... yes
 checking for stdlib.h... yes
@@ -222,7 +242,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... 32768
+checking the maximum length of command line arguments... 98304
 checking command to parse /usr/bin/nm -B output from gcc object... ok
 checking for objdir... .libs
 checking for ar... ar
@@ -317,18 +337,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making all in m4
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making all in po
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -337,30 +357,30 @@ if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDL
 	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --tag=CC --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
-gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
+gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so  
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make check
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making check in m4
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making check in po
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  dsh
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -407,11 +427,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-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
-Wed Aug  1 03:16:28 UTC 2007
+Fri Aug 17 03:17:56 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -481,14 +501,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Wed Aug  1 03:16:33 UTC 2007
+Fri Aug 17 03:18:01 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 c: c
-dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -497,9 +516,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -507,58 +526,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/tmp/buildd/dsh-0.25.8/debian/dsh
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+/usr/bin/make install DESTDIR=/tmp/buildd/dsh-0.25.9/debian/dsh
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making install in m4
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making install in po
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/gettext/po/$file; \
+			    /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
-test -z "/usr/bin" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
+test -z "/usr/bin" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-cp /tmp/buildd/dsh-0.25.8/debian/machines.list /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/machines.list
-cp /tmp/buildd/dsh-0.25.8/dsh.conf /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/group/all
-install -d /tmp/buildd/dsh-0.25.8/debian/dsh/usr/lib/update-cluster
-install -m 755 /tmp/buildd/dsh-0.25.8/debian/dsh.updatelist /tmp/buildd/dsh-0.25.8/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+cp /tmp/buildd/dsh-0.25.9/debian/machines.list /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/machines.list
+cp /tmp/buildd/dsh-0.25.9/dsh.conf /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/group/all
+install -d /tmp/buildd/dsh-0.25.9/debian/dsh/usr/lib/update-cluster
+install -m 755 /tmp/buildd/dsh-0.25.9/debian/dsh.updatelist /tmp/buildd/dsh-0.25.9/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -575,7 +594,7 @@ dh_installdeb
 dh_gencontrol
 dh_md5sums
 dh_builddeb
-dpkg-deb: building package `dsh' in `../dsh_0.25.8-1_amd64.deb'.
+dpkg-deb: building package `dsh' in `../dsh_0.25.9-1_amd64.deb'.
  dpkg-genchanges -mJunichi Uekawa <dancer@debian.org>
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index a91d92e..b0e7791 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -14,23 +14,25 @@ Installing the build-deps
    -> Trying debhelper
  -> Considering build-dep libdshconfig1-dev (>= 0.20.11-1)
    -> Trying libdshconfig1-dev
- -> Installing  debhelper libdshconfig1-dev
+ -> Considering build-dep po4a
+   -> Trying po4a
+ -> Installing  debhelper libdshconfig1-dev po4a
 Reading package lists...
 Building dependency tree...
 Reading state information...
 The following extra packages will be installed:
   file gettext gettext-base html2text intltool-debian libdshconfig1 libmagic1
-  po-debconf
+  libsgmls-perl libsp1c2 po-debconf sp
 Suggested packages:
-  dh-make cvs gettext-doc
+  dh-make cvs gettext-doc sgmlspl sgmls-doc doc-base sgml-data
 Recommended packages:
-  libmail-sendmail-perl libcompress-zlib-perl
+  libmail-sendmail-perl libcompress-zlib-perl libterm-readkey-perl
 The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
-  libdshconfig1-dev libmagic1 po-debconf
-0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3571kB of archives.
-After unpacking 12.1MB of additional disk space will be used.
+  libdshconfig1-dev libmagic1 libsgmls-perl libsp1c2 po-debconf po4a sp
+0 upgraded, 14 newly installed, 0 to remove and 0 not upgraded.
+Need to get 5888kB of archives.
+After unpacking 19.3MB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.21-2 [332kB]
 Get:2 http://cdn.debian.or.jp sid/main file 4.21-2 [40.0kB]
 Get:3 http://cdn.debian.or.jp sid/main gettext-base 0.16.1-2 [133kB]
@@ -39,11 +41,15 @@ Get:5 http://cdn.debian.or.jp sid/main gettext 0.16.1-2 [2269kB]
 Get:6 http://cdn.debian.or.jp sid/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:7 http://cdn.debian.or.jp sid/main po-debconf 1.0.9 [117kB]
 Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.53 [520kB]
-Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.12-2 [10.9kB]
-Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
+Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.13-1 [11.0kB]
+Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.13-1 [25.4kB]
+Get:11 http://cdn.debian.or.jp sid/main libsgmls-perl 1.03ii-31 [29.3kB]
+Get:12 http://cdn.debian.or.jp sid/main libsp1c2 1.3.4-1.2.1-47 [1386kB]
+Get:13 http://cdn.debian.or.jp sid/main sp 1.3.4-1.2.1-47 [182kB]
+Get:14 http://cdn.debian.or.jp sid/main po4a 0.31-1 [720kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11089 files and directories currently installed.)
+(Reading database ... 11096 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.21-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.21-2_amd64.deb) ...
@@ -60,9 +66,17 @@ Unpacking po-debconf (from .../po-debconf_1.0.9_all.deb) ...
 Selecting previously deselected package debhelper.
 Unpacking debhelper (from .../debhelper_5.0.53_all.deb) ...
 Selecting previously deselected package libdshconfig1.
-Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
+Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
-Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
+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-31_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.31-1_all.deb) ...
 Setting up libmagic1 (4.21-2) ...
 
 Setting up file (4.21-2) ...
@@ -75,9 +89,15 @@ Setting up gettext (0.16.1-2) ...
 Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.9) ...
 Setting up debhelper (5.0.53) ...
-Setting up libdshconfig1 (0.20.12-2) ...
+Setting up libdshconfig1 (0.20.13-1) ...
 
-Setting up libdshconfig1-dev (0.20.12-2) ...
+Setting up libdshconfig1-dev (0.20.13-1) ...
+Setting up libsgmls-perl (1.03ii-31) ...
+Setting up libsp1c2 (1.3.4-1.2.1-47) ...
+
+Setting up sp (1.3.4-1.2.1-47) ...
+
+Setting up po4a (0.31-1) ...
  -> Finished parsing the build-deps
 Reading package lists...
 Building dependency tree...
@@ -90,47 +110,47 @@ After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main fakeroot 1.7.1 [111kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11770 files and directories currently installed.)
+(Reading database ... 12038 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
 Copying source file
-    -> copying [/TESTDIR/dir1/dsh_0.25.8-1.dsc]
-    -> copying [/TESTDIR/dir1/dsh_0.25.8.orig.tar.gz]
-    -> copying [/TESTDIR/dir1/dsh_0.25.8-1.diff.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.9-1.dsc]
+    -> copying [/TESTDIR/dir1/dsh_0.25.9.orig.tar.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.9-1.diff.gz]
 Extracting source
 gpg: can't open `/gnupg/options.skel': No such file or directory
-gpg: Signature made Fri May 18 11:19:27 2007 UTC using DSA key ID E81E55C1
+gpg: Signature made Wed Aug 15 00:10:09 2007 UTC using DSA key ID E81E55C1
 gpg: Can't check signature: public key not found
-dpkg-source: extracting dsh in dsh-0.25.8
-dpkg-source: unpacking dsh_0.25.8.orig.tar.gz
-dpkg-source: applying ./dsh_0.25.8-1.diff.gz
+dpkg-source: extracting dsh in dsh-0.25.9
+dpkg-source: unpacking dsh_0.25.9.orig.tar.gz
+dpkg-source: applying ./dsh_0.25.9-1.diff.gz
  -> Building the package
 dpkg-buildpackage: source package is dsh
-dpkg-buildpackage: source version is 0.25.8-1
+dpkg-buildpackage: source version is 0.25.9-1
 dpkg-buildpackage: host architecture amd64
-dpkg-buildpackage: source version without epoch 0.25.8-1
+dpkg-buildpackage: source version without epoch 0.25.9-1
  fakeroot debian/rules clean
 dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 dh_clean
- dpkg-source -b dsh-0.25.8
-dpkg-source: building dsh using existing dsh_0.25.8.orig.tar.gz
-dpkg-source: building dsh in dsh_0.25.8-1.diff.gz
+ dpkg-source -b dsh-0.25.9
+dpkg-source: building dsh using existing dsh_0.25.9.orig.tar.gz
+dpkg-source: building dsh in dsh_0.25.9-1.diff.gz
 dpkg-source: warning: file debian/compat has no final newline (either original or modified version)
 dpkg-source: warning: file dcp.sh has no final newline (either original or modified version)
-dpkg-source: building dsh in dsh_0.25.8-1.dsc
+dpkg-source: building dsh in dsh_0.25.9-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
@@ -177,7 +197,7 @@ checking if the linker (/usr/bin/ld) is GNU ld... yes
 checking for /usr/bin/ld option to reload object files... -r
 checking for BSD-compatible nm... /usr/bin/nm -B
 checking whether ln -s works... yes
-checking how to recognise dependent libraries... pass_all
+checking how to recognize dependent libraries... pass_all
 checking for sys/types.h... yes
 checking for sys/stat.h... yes
 checking for stdlib.h... yes
@@ -222,7 +242,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... 32768
+checking the maximum length of command line arguments... 98304
 checking command to parse /usr/bin/nm -B output from gcc object... ok
 checking for objdir... .libs
 checking for ar... ar
@@ -317,18 +337,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making all in m4
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making all in po
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -337,30 +357,30 @@ if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDL
 	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --tag=CC --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
-gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
+gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so  
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make check
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making check in m4
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making check in po
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  dsh
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -398,8 +418,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -407,11 +427,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-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
-Wed Aug  1 03:03:21 UTC 2007
+Fri Aug 17 03:04:04 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -481,14 +501,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Wed Aug  1 03:03:26 UTC 2007
+Fri Aug 17 03:04:09 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 c: c
 dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -497,9 +517,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -507,58 +527,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/tmp/buildd/dsh-0.25.8/debian/dsh
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+/usr/bin/make install DESTDIR=/tmp/buildd/dsh-0.25.9/debian/dsh
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making install in m4
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making install in po
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/gettext/po/$file; \
+			    /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
-test -z "/usr/bin" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
+test -z "/usr/bin" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-cp /tmp/buildd/dsh-0.25.8/debian/machines.list /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/machines.list
-cp /tmp/buildd/dsh-0.25.8/dsh.conf /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/group/all
-install -d /tmp/buildd/dsh-0.25.8/debian/dsh/usr/lib/update-cluster
-install -m 755 /tmp/buildd/dsh-0.25.8/debian/dsh.updatelist /tmp/buildd/dsh-0.25.8/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+cp /tmp/buildd/dsh-0.25.9/debian/machines.list /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/machines.list
+cp /tmp/buildd/dsh-0.25.9/dsh.conf /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/group/all
+install -d /tmp/buildd/dsh-0.25.9/debian/dsh/usr/lib/update-cluster
+install -m 755 /tmp/buildd/dsh-0.25.9/debian/dsh.updatelist /tmp/buildd/dsh-0.25.9/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -575,7 +595,7 @@ dh_installdeb
 dh_gencontrol
 dh_md5sums
 dh_builddeb
-dpkg-deb: building package `dsh' in `../dsh_0.25.8-1_amd64.deb'.
+dpkg-deb: building package `dsh' in `../dsh_0.25.9-1_amd64.deb'.
  dpkg-genchanges -mJunichi Uekawa <dancer@debian.org>
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index c138b21..351edb6 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -619,13 +619,13 @@ The following NEW packages will be installed:
   perl-modules
 0 upgraded, 17 newly installed, 0 to remove and 0 not upgraded.
 Need to get 21.2MB of archives.
-After unpacking 86.5MB of additional disk space will be used.
+After unpacking 86.4MB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp etch/main patch 2.5.9-4 [98.7kB]
 Get:2 http://cdn.debian.or.jp etch/main perl-modules 5.8.8-7 [2310kB]
 Get:3 http://cdn.debian.or.jp etch/main perl 5.8.8-7 [4240kB]
 Get:4 http://cdn.debian.or.jp etch/main binutils 2.17-3 [2630kB]
 Get:5 http://cdn.debian.or.jp etch/main linux-kernel-headers 2.6.18-7 [1872kB]
-Get:6 http://cdn.debian.or.jp etch/main libc6-dev 2.3.6.ds1-13 [2118kB]
+Get:6 http://cdn.debian.or.jp etch/main libc6-dev 2.3.6.ds1-13etch2 [2112kB]
 Get:7 http://cdn.debian.or.jp etch/main cpp-4.1 4.1.1-21 [2482kB]
 Get:8 http://cdn.debian.or.jp etch/main cpp 4:4.1.1-15 [11.6kB]
 Get:9 http://cdn.debian.or.jp etch/main libssp0 4.1.1-21 [4956B]
@@ -650,7 +650,7 @@ Unpacking binutils (from .../binutils_2.17-3_amd64.deb) ...
 Selecting previously deselected package linux-kernel-headers.
 Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.18-7_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
-Unpacking libc6-dev (from .../libc6-dev_2.3.6.ds1-13_amd64.deb) ...
+Unpacking libc6-dev (from .../libc6-dev_2.3.6.ds1-13etch2_amd64.deb) ...
 Selecting previously deselected package cpp-4.1.
 Unpacking cpp-4.1 (from .../cpp-4.1_4.1.1-21_amd64.deb) ...
 Selecting previously deselected package cpp.
@@ -677,7 +677,7 @@ Setting up patch (2.5.9-4) ...
 Setting up binutils (2.17-3) ...
 
 Setting up linux-kernel-headers (2.6.18-7) ...
-Setting up libc6-dev (2.3.6.ds1-13) ...
+Setting up libc6-dev (2.3.6.ds1-13etch2) ...
 Setting up cpp-4.1 (4.1.1-21) ...
 Setting up cpp (4.1.1-15) ...
 
diff --git a/testsuite/normal/pbuilder-create-lenny.log b/testsuite/normal/pbuilder-create-lenny.log
index 59f81c6..5530bca 100644
--- a/testsuite/normal/pbuilder-create-lenny.log
+++ b/testsuite/normal/pbuilder-create-lenny.log
@@ -7,7 +7,7 @@ I: Retrieving Packages
 I: Validating Packages
 I: Resolving dependencies of required packages...
 I: Resolving dependencies of base packages...
-I: Found additional base dependencies: liblzo2-2 openbsd-inetd 
+I: Found additional base dependencies: liblzo2-2 
 I: Checking component main on http://cdn.debian.or.jp/debian...
 I: Retrieving adduser
 I: Validating adduser
@@ -153,8 +153,6 @@ I: Retrieving libpopt0
 I: Validating libpopt0
 I: Retrieving libreadline5
 I: Validating libreadline5
-I: Retrieving libsasl2
-I: Validating libsasl2
 I: Retrieving libsasl2-2
 I: Validating libsasl2-2
 I: Retrieving libselinux1
@@ -217,8 +215,6 @@ I: Retrieving netbase
 I: Validating netbase
 I: Retrieving netcat
 I: Validating netcat
-I: Retrieving openbsd-inetd
-I: Validating openbsd-inetd
 I: Retrieving passwd
 I: Validating passwd
 I: Retrieving perl-base
@@ -491,7 +487,6 @@ I: Unpacking libopencdk10...
 I: Unpacking libopencdk8...
 I: Unpacking libpopt0...
 I: Unpacking libreadline5...
-I: Unpacking libsasl2...
 I: Unpacking libsasl2-2...
 I: Unpacking libsigc++-2.0-0c2a...
 I: Unpacking libssl0.9.8...
@@ -506,7 +501,6 @@ I: Unpacking nano...
 I: Unpacking net-tools...
 I: Unpacking netbase...
 I: Unpacking netcat...
-I: Unpacking openbsd-inetd...
 I: Unpacking readline-common...
 I: Unpacking sysklogd...
 I: Unpacking tasksel...
@@ -550,7 +544,6 @@ I: Configuring info...
 I: Configuring iputils-ping...
 I: Configuring libbz2-1.0...
 I: Configuring cron...
-I: Configuring libsasl2...
 I: Configuring nano...
 I: Configuring dhcp3-common...
 I: Configuring libconsole...
@@ -567,7 +560,6 @@ I: Configuring libgcrypt11...
 I: Configuring whiptail...
 I: Configuring ifupdown...
 I: Configuring dhcp3-client...
-I: Configuring openbsd-inetd...
 I: Configuring libreadline5...
 I: Configuring logrotate...
 I: Configuring libopencdk8...
@@ -630,11 +622,11 @@ The following NEW packages will be installed:
   libc6-dev libstdc++6-4.1-dev linux-libc-dev make patch perl perl-modules
 0 upgraded, 16 newly installed, 0 to remove and 0 not upgraded.
 Need to get 20.0MB of archives.
-After unpacking 78.8MB of additional disk space will be used.
+After unpacking 78.9MB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main patch 2.5.9-4 [98.7kB]
 Get:2 http://cdn.debian.or.jp lenny/main perl-modules 5.8.8-7 [2310kB]
 Get:3 http://cdn.debian.or.jp lenny/main perl 5.8.8-7 [4240kB]
-Get:4 http://cdn.debian.or.jp lenny/main binutils 2.17cvs20070718-1 [2666kB]
+Get:4 http://cdn.debian.or.jp lenny/main binutils 2.17cvs20070804-1 [2671kB]
 Get:5 http://cdn.debian.or.jp lenny/main linux-libc-dev 2.6.21-6 [686kB]
 Get:6 http://cdn.debian.or.jp lenny/main libc6-dev 2.6-2 [2482kB]
 Get:7 http://cdn.debian.or.jp lenny/main cpp-4.1 4.1.2-13 [2514kB]
@@ -649,14 +641,14 @@ Get:15 http://cdn.debian.or.jp lenny/main dpkg-dev 1.14.5 [183kB]
 Get:16 http://cdn.debian.or.jp lenny/main build-essential 11.3 [6982B]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package patch.
-(Reading database ... 7153 files and directories currently installed.)
+(Reading database ... 7146 files and directories currently installed.)
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
 Selecting previously deselected package perl-modules.
 Unpacking perl-modules (from .../perl-modules_5.8.8-7_all.deb) ...
 Selecting previously deselected package perl.
 Unpacking perl (from .../perl_5.8.8-7_amd64.deb) ...
 Selecting previously deselected package binutils.
-Unpacking binutils (from .../binutils_2.17cvs20070718-1_amd64.deb) ...
+Unpacking binutils (from .../binutils_2.17cvs20070804-1_amd64.deb) ...
 Selecting previously deselected package linux-libc-dev.
 Unpacking linux-libc-dev (from .../linux-libc-dev_2.6.21-6_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
@@ -682,7 +674,7 @@ Unpacking dpkg-dev (from .../dpkg-dev_1.14.5_all.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.3_amd64.deb) ...
 Setting up patch (2.5.9-4) ...
-Setting up binutils (2.17cvs20070718-1) ...
+Setting up binutils (2.17cvs20070804-1) ...
 
 Setting up linux-libc-dev (2.6.21-6) ...
 Setting up libc6-dev (2.6-2) ...
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index b912a50..2b64ff1 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -627,50 +627,50 @@ The following NEW packages will be installed:
   binutils build-essential cpp cpp-4.1 dpkg-dev g++ g++-4.1 gcc gcc-4.1
   libc6-dev libstdc++6-4.1-dev linux-libc-dev make patch perl perl-modules
 0 upgraded, 16 newly installed, 0 to remove and 0 not upgraded.
-Need to get 20.0MB of archives.
-After unpacking 78.9MB of additional disk space will be used.
+Need to get 20.1MB of archives.
+After unpacking 79.0MB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main patch 2.5.9-4 [98.7kB]
 Get:2 http://cdn.debian.or.jp sid/main perl-modules 5.8.8-7 [2310kB]
 Get:3 http://cdn.debian.or.jp sid/main perl 5.8.8-7 [4240kB]
-Get:4 http://cdn.debian.or.jp sid/main binutils 2.17cvs20070718-1 [2666kB]
+Get:4 http://cdn.debian.or.jp sid/main binutils 2.18~cvs20070812-1 [2683kB]
 Get:5 http://cdn.debian.or.jp sid/main linux-libc-dev 2.6.22-3 [699kB]
-Get:6 http://cdn.debian.or.jp sid/main libc6-dev 2.6-5 [2485kB]
-Get:7 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-14 [2516kB]
+Get:6 http://cdn.debian.or.jp sid/main libc6-dev 2.6.1-1 [2493kB]
+Get:7 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-15 [2518kB]
 Get:8 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-3 [11.9kB]
-Get:9 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-14 [426kB]
+Get:9 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-15 [427kB]
 Get:10 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-3 [5058B]
-Get:11 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-14 [1154kB]
-Get:12 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-14 [2824kB]
+Get:11 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-15 [1154kB]
+Get:12 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-15 [2827kB]
 Get:13 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-3 [1374B]
 Get:14 http://cdn.debian.or.jp sid/main make 3.81-3 [395kB]
 Get:15 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.5 [183kB]
 Get:16 http://cdn.debian.or.jp sid/main build-essential 11.3 [6982B]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package patch.
-(Reading database ... 7189 files and directories currently installed.)
+(Reading database ... 7196 files and directories currently installed.)
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
 Selecting previously deselected package perl-modules.
 Unpacking perl-modules (from .../perl-modules_5.8.8-7_all.deb) ...
 Selecting previously deselected package perl.
 Unpacking perl (from .../perl_5.8.8-7_amd64.deb) ...
 Selecting previously deselected package binutils.
-Unpacking binutils (from .../binutils_2.17cvs20070718-1_amd64.deb) ...
+Unpacking binutils (from .../binutils_2.18~cvs20070812-1_amd64.deb) ...
 Selecting previously deselected package linux-libc-dev.
 Unpacking linux-libc-dev (from .../linux-libc-dev_2.6.22-3_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
-Unpacking libc6-dev (from .../libc6-dev_2.6-5_amd64.deb) ...
+Unpacking libc6-dev (from .../libc6-dev_2.6.1-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.1.
-Unpacking cpp-4.1 (from .../cpp-4.1_4.1.2-14_amd64.deb) ...
+Unpacking cpp-4.1 (from .../cpp-4.1_4.1.2-15_amd64.deb) ...
 Selecting previously deselected package cpp.
 Unpacking cpp (from .../cpp_4%3a4.1.2-3_amd64.deb) ...
 Selecting previously deselected package gcc-4.1.
-Unpacking gcc-4.1 (from .../gcc-4.1_4.1.2-14_amd64.deb) ...
+Unpacking gcc-4.1 (from .../gcc-4.1_4.1.2-15_amd64.deb) ...
 Selecting previously deselected package gcc.
 Unpacking gcc (from .../gcc_4%3a4.1.2-3_amd64.deb) ...
 Selecting previously deselected package libstdc++6-4.1-dev.
-Unpacking libstdc++6-4.1-dev (from .../libstdc++6-4.1-dev_4.1.2-14_amd64.deb) ...
+Unpacking libstdc++6-4.1-dev (from .../libstdc++6-4.1-dev_4.1.2-15_amd64.deb) ...
 Selecting previously deselected package g++-4.1.
-Unpacking g++-4.1 (from .../g++-4.1_4.1.2-14_amd64.deb) ...
+Unpacking g++-4.1 (from .../g++-4.1_4.1.2-15_amd64.deb) ...
 Selecting previously deselected package g++.
 Unpacking g++ (from .../g++_4%3a4.1.2-3_amd64.deb) ...
 Selecting previously deselected package make.
@@ -680,20 +680,20 @@ Unpacking dpkg-dev (from .../dpkg-dev_1.14.5_all.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.3_amd64.deb) ...
 Setting up patch (2.5.9-4) ...
-Setting up binutils (2.17cvs20070718-1) ...
+Setting up binutils (2.18~cvs20070812-1) ...
 
 Setting up linux-libc-dev (2.6.22-3) ...
-Setting up libc6-dev (2.6-5) ...
-Setting up cpp-4.1 (4.1.2-14) ...
+Setting up libc6-dev (2.6.1-1) ...
+Setting up cpp-4.1 (4.1.2-15) ...
 Setting up cpp (4:4.1.2-3) ...
 
-Setting up gcc-4.1 (4.1.2-14) ...
+Setting up gcc-4.1 (4.1.2-15) ...
 Setting up gcc (4:4.1.2-3) ...
 
 Setting up make (3.81-3) ...
-Setting up libstdc++6-4.1-dev (4.1.2-14) ...
+Setting up libstdc++6-4.1-dev (4.1.2-15) ...
 Setting up perl-modules (5.8.8-7) ...
-Setting up g++-4.1 (4.1.2-14) ...
+Setting up g++-4.1 (4.1.2-15) ...
 Setting up g++ (4:4.1.2-3) ...
 
 Setting up perl (5.8.8-7) ...
diff --git a/testsuite/normal/pbuilder-update-etch-etch.log b/testsuite/normal/pbuilder-update-etch-etch.log
index 4e79011..0e03298 100644
--- a/testsuite/normal/pbuilder-update-etch-etch.log
+++ b/testsuite/normal/pbuilder-update-etch-etch.log
@@ -11,42 +11,43 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://cdn.debian.or.jp lenny Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp lenny Release [68.5kB]
-Get:3 http://cdn.debian.or.jp lenny/main Packages [5983kB]
+Get:3 http://cdn.debian.or.jp lenny/main Packages [6021kB]
 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 REMOVED:
-  build-essential g++ g++-4.1 libc6-dev libssp0 libstdc++6-4.1-dev
+  build-essential g++ g++-4.1 libc6-dev libsasl2 libssp0 libstdc++6-4.1-dev
 The following NEW packages will be installed:
   gcc-4.2-base liblzo2-2
 The following packages will be upgraded:
   adduser apt apt-utils aptitude base-files binutils cpio cpp-4.1 debconf
   debconf-i18n debian-archive-keyring debianutils dhcp3-client dhcp3-common
   diff dmidecode dpkg dpkg-dev dselect findutils gcc-4.1 gcc-4.1-base gzip
-  info iputils-ping klogd laptop-detect libacl1 libattr1 libc6 libgcc1
-  libgcrypt11 libgnutls13 libgpg-error0 libldap2 libncurses5 libncursesw5
-  libopencdk8 libreadline5 libselinux1 libsepol1 libslang2 libssl0.9.8
-  libstdc++6 libtasn1-3 libusb-0.1-4 login make man-db manpages mktemp
-  module-init-tools nano ncurses-base ncurses-bin netcat passwd
-  readline-common sed sysklogd tar tasksel tasksel-data tzdata vim-common
-  vim-tiny wget zlib1g
-68 upgraded, 2 newly installed, 6 to remove and 0 not upgraded.
-Need to get 31.9MB of archives.
-After unpacking 23.9MB disk space will be freed.
+  info initscripts iptables iputils-ping klogd laptop-detect libacl1 libattr1
+  libbz2-1.0 libc6 libgcc1 libgcrypt11 libgnutls13 libgpg-error0 libldap2
+  libncurses5 libncursesw5 libopencdk8 libreadline5 libsasl2-2 libselinux1
+  libsepol1 libslang2 libssl0.9.8 libstdc++6 libtasn1-3 libusb-0.1-4 libwrap0
+  login lsb-base make man-db manpages mktemp module-init-tools nano
+  ncurses-base ncurses-bin netbase netcat passwd readline-common sed sysklogd
+  sysv-rc sysvinit sysvinit-utils tar tasksel tasksel-data tcpd tzdata
+  vim-common vim-tiny wget zlib1g
+79 upgraded, 2 newly installed, 7 to remove and 0 not upgraded.
+Need to get 33.1MB of archives.
+After unpacking 23.7MB disk space will be freed.
 Get:1 http://cdn.debian.or.jp lenny/main gcc-4.2-base 4.2-20070712-1 [211kB]
-Get:2 http://cdn.debian.or.jp lenny/main debconf-i18n 1.5.13 [151kB]
-Get:3 http://cdn.debian.or.jp lenny/main debconf 1.5.13 [148kB]
-Get:4 http://cdn.debian.or.jp lenny/main tzdata 2007f-9 [388kB]
+Get:2 http://cdn.debian.or.jp lenny/main debconf-i18n 1.5.14 [160kB]
+Get:3 http://cdn.debian.or.jp lenny/main debconf 1.5.14 [150kB]
+Get:4 http://cdn.debian.or.jp lenny/main tzdata 2007f-10 [729kB]
 Get:5 http://cdn.debian.or.jp lenny/main libc6 2.6-2 [4886kB]
 Get:6 http://cdn.debian.or.jp lenny/main libgcc1 1:4.2-20070712-1 [26.7kB]
 Get:7 http://cdn.debian.or.jp lenny/main libstdc++6 4.2-20070712-1 [313kB]
 Get:8 http://cdn.debian.or.jp lenny/main gcc-4.1 4.1.2-13 [425kB]
 Get:9 http://cdn.debian.or.jp lenny/main cpp-4.1 4.1.2-13 [2514kB]
 Get:10 http://cdn.debian.or.jp lenny/main gcc-4.1-base 4.1.2-13 [202kB]
-Get:11 http://cdn.debian.or.jp lenny/main binutils 2.17cvs20070718-1 [2666kB]
-Get:12 http://cdn.debian.or.jp lenny/main debianutils 2.22.1 [53.4kB]
+Get:11 http://cdn.debian.or.jp lenny/main binutils 2.17cvs20070804-1 [2671kB]
+Get:12 http://cdn.debian.or.jp lenny/main debianutils 2.23.1 [53.5kB]
 Get:13 http://cdn.debian.or.jp lenny/main diff 2.8.1-12 [192kB]
 Get:14 http://cdn.debian.or.jp lenny/main cpio 2.7-3 [115kB]
 Get:15 http://cdn.debian.or.jp lenny/main make 3.81-3 [395kB]
@@ -59,74 +60,87 @@ Get:21 http://cdn.debian.or.jp lenny/main mktemp 1.5-3 [11.0kB]
 Get:22 http://cdn.debian.or.jp lenny/main libncurses5 5.6+20070716-1 [340kB]
 Get:23 http://cdn.debian.or.jp lenny/main ncurses-bin 5.6+20070716-1 [160kB]
 Get:24 http://cdn.debian.or.jp lenny/main sed 4.1.5-2 [253kB]
-Get:25 http://cdn.debian.or.jp lenny/main tar 1.16.1-1 [734kB]
-Get:26 http://cdn.debian.or.jp lenny/main base-files 4.0.0 [40.9kB]
-Get:27 http://cdn.debian.or.jp lenny/main ncurses-base 5.6+20070716-1 [12.9kB]
-Get:28 http://cdn.debian.or.jp lenny/main apt-utils 0.7.3 [194kB]
-Get:29 http://cdn.debian.or.jp lenny/main libncursesw5 5.6+20070716-1 [361kB]
-Get:30 http://cdn.debian.or.jp lenny/main aptitude 0.4.5.4-1 [2991kB]
-Get:31 http://cdn.debian.or.jp lenny/main debian-archive-keyring 2007.02.19-0.1 [8088B]
-Get:32 http://cdn.debian.or.jp lenny/main apt 0.7.3 [1460kB]
-Get:33 http://cdn.debian.or.jp lenny/main libattr1 1:2.4.32-1.1 [9976B]
-Get:34 http://cdn.debian.or.jp lenny/main libacl1 2.2.42-1 [16.1kB]
-Get:35 http://cdn.debian.or.jp lenny/main libsepol1 2.0.3-1+b1 [128kB]
-Get:36 http://cdn.debian.or.jp lenny/main libselinux1 2.0.15-2+b1 [67.5kB]
-Get:37 http://cdn.debian.or.jp lenny/main libslang2 2.0.7-1 [453kB]
-Get:38 http://cdn.debian.or.jp lenny/main zlib1g 1:1.2.3.3.dfsg-5 [73.4kB]
-Get:39 http://cdn.debian.or.jp lenny/main passwd 1:4.0.18.1-11 [776kB]
-Get:40 http://cdn.debian.or.jp lenny/main adduser 3.104 [169kB]
-Get:41 http://cdn.debian.or.jp lenny/main dhcp3-client 3.0.5-3 [230kB]
-Get:42 http://cdn.debian.or.jp lenny/main dhcp3-common 3.0.5-3 [292kB]
-Get:43 http://cdn.debian.or.jp lenny/main dmidecode 2.9-1 [58.8kB]
-Get:44 http://cdn.debian.or.jp lenny/main info 4.8.dfsg.1-6 [177kB]
-Get:45 http://cdn.debian.or.jp lenny/main iputils-ping 3:20070202-2 [45.7kB]
-Get:46 http://cdn.debian.or.jp lenny/main sysklogd 1.4.1-20 [60.2kB]
-Get:47 http://cdn.debian.or.jp lenny/main klogd 1.4.1-20 [40.7kB]
-Get:48 http://cdn.debian.or.jp lenny/main laptop-detect 0.12.1-0.1 [3666B]
-Get:49 http://cdn.debian.or.jp lenny/main libgpg-error0 1.4-2 [34.8kB]
-Get:50 http://cdn.debian.or.jp lenny/main libgcrypt11 1.2.4-2 [190kB]
-Get:51 http://cdn.debian.or.jp lenny/main liblzo2-2 2.02-3 [55.9kB]
-Get:52 http://cdn.debian.or.jp lenny/main libopencdk8 0.5.13-2 [104kB]
-Get:53 http://cdn.debian.or.jp lenny/main libtasn1-3 0.3.9-1 [57.8kB]
-Get:54 http://cdn.debian.or.jp lenny/main libgnutls13 1.6.3-1 [354kB]
-Get:55 http://cdn.debian.or.jp lenny/main libldap2 2.1.30-13.4 [162kB]
-Get:56 http://cdn.debian.or.jp lenny/main readline-common 5.2-3 [50.8kB]
-Get:57 http://cdn.debian.or.jp lenny/main libreadline5 5.2-3 [144kB]
-Get:58 http://cdn.debian.or.jp lenny/main libssl0.9.8 0.9.8e-5+b1 [921kB]
-Get:59 http://cdn.debian.or.jp lenny/main libusb-0.1-4 2:0.1.12-7 [20.4kB]
-Get:60 http://cdn.debian.or.jp lenny/main man-db 2.4.4-3 [765kB]
-Get:61 http://cdn.debian.or.jp lenny/main manpages 2.57-1 [510kB]
-Get:62 http://cdn.debian.or.jp lenny/main module-init-tools 3.3-pre11-4 [76.4kB]
-Get:63 http://cdn.debian.or.jp lenny/main nano 2.0.3-1 [570kB]
-Get:64 http://cdn.debian.or.jp lenny/main netcat 1.10-33 [68.3kB]
-Get:65 http://cdn.debian.or.jp lenny/main tasksel 2.68 [77.0kB]
-Get:66 http://cdn.debian.or.jp lenny/main tasksel-data 2.68 [350kB]
-Get:67 http://cdn.debian.or.jp lenny/main vim-tiny 1:7.1-022+1 [619kB]
-Get:68 http://cdn.debian.or.jp lenny/main vim-common 1:7.1-022+1 [180kB]
-Get:69 http://cdn.debian.or.jp lenny/main wget 1.10.2-3 [624kB]
-Get:70 http://cdn.debian.or.jp lenny/main dselect 1.14.5 [513kB]
-
Extracting templates from packages: 42%
Extracting templates from packages: 85%
Extracting templates from packages: 100%
+Get:25 http://cdn.debian.or.jp lenny/main libsepol1 2.0.3-1+b1 [128kB]
+Get:26 http://cdn.debian.or.jp lenny/main libselinux1 2.0.15-2+b1 [67.5kB]
+Get:27 http://cdn.debian.or.jp lenny/main sysvinit 2.86.ds1-38.1 [112kB]
+Get:28 http://cdn.debian.or.jp lenny/main tar 1.16.1-1 [734kB]
+Get:29 http://cdn.debian.or.jp lenny/main base-files 4.0.0 [40.9kB]
+Get:30 http://cdn.debian.or.jp lenny/main ncurses-base 5.6+20070716-1 [12.9kB]
+Get:31 http://cdn.debian.or.jp lenny/main sysvinit-utils 2.86.ds1-38.1 [67.5kB]
+Get:32 http://cdn.debian.or.jp lenny/main apt-utils 0.7.3 [194kB]
+Get:33 http://cdn.debian.or.jp lenny/main libncursesw5 5.6+20070716-1 [361kB]
+Get:34 http://cdn.debian.or.jp lenny/main aptitude 0.4.5.4-1 [2991kB]
+Get:35 http://cdn.debian.or.jp lenny/main debian-archive-keyring 2007.07.31 [9292B]
+Get:36 http://cdn.debian.or.jp lenny/main apt 0.7.3 [1460kB]
+Get:37 http://cdn.debian.or.jp lenny/main lsb-base 3.1-24 [16.9kB]
+Get:38 http://cdn.debian.or.jp lenny/main initscripts 2.86.ds1-38.1 [60.1kB]
+Get:39 http://cdn.debian.or.jp lenny/main libattr1 1:2.4.32-1.2 [10.3kB]
+Get:40 http://cdn.debian.or.jp lenny/main libacl1 2.2.42-1 [16.1kB]
+Get:41 http://cdn.debian.or.jp lenny/main libslang2 2.0.7-3 [457kB]
+Get:42 http://cdn.debian.or.jp lenny/main sysv-rc 2.86.ds1-38.1 [56.2kB]
+Get:43 http://cdn.debian.or.jp lenny/main zlib1g 1:1.2.3.3.dfsg-5 [73.4kB]
+Get:44 http://cdn.debian.or.jp lenny/main passwd 1:4.0.18.1-11 [776kB]
+Get:45 http://cdn.debian.or.jp lenny/main adduser 3.104 [169kB]
+Get:46 http://cdn.debian.or.jp lenny/main dhcp3-client 3.0.6-1 [231kB]
+Get:47 http://cdn.debian.or.jp lenny/main dhcp3-common 3.0.6-1 [293kB]
+Get:48 http://cdn.debian.or.jp lenny/main dmidecode 2.9-1 [58.8kB]
+Get:49 http://cdn.debian.or.jp lenny/main info 4.8.dfsg.1-6 [177kB]
+Get:50 http://cdn.debian.or.jp lenny/main iptables 1.3.8.0debian1-1 [455kB]
+Get:51 http://cdn.debian.or.jp lenny/main iputils-ping 3:20070202-2 [45.7kB]
+Get:52 http://cdn.debian.or.jp lenny/main sysklogd 1.5-1 [62.6kB]
+Get:53 http://cdn.debian.or.jp lenny/main klogd 1.5-1 [43.9kB]
+Get:54 http://cdn.debian.or.jp lenny/main laptop-detect 0.12.1-0.1 [3666B]
+Get:55 http://cdn.debian.or.jp lenny/main libbz2-1.0 1.0.3-7 [41.6kB]
+Get:56 http://cdn.debian.or.jp lenny/main libgpg-error0 1.4-2 [34.8kB]
+Get:57 http://cdn.debian.or.jp lenny/main libgcrypt11 1.2.4-2 [190kB]
+Get:58 http://cdn.debian.or.jp lenny/main liblzo2-2 2.02-3 [55.9kB]
+Get:59 http://cdn.debian.or.jp lenny/main libopencdk8 0.5.13-2 [104kB]
+Get:60 http://cdn.debian.or.jp lenny/main libtasn1-3 0.3.9-1 [57.8kB]
+Get:61 http://cdn.debian.or.jp lenny/main libgnutls13 1.6.3-1 [354kB]
+Get:62 http://cdn.debian.or.jp lenny/main libsasl2-2 2.1.22.dfsg1-13 [108kB]
+Get:63 http://cdn.debian.or.jp lenny/main libldap2 2.1.30-13.4 [162kB]
+Get:64 http://cdn.debian.or.jp lenny/main readline-common 5.2-3 [50.8kB]
+Get:65 http://cdn.debian.or.jp lenny/main libreadline5 5.2-3 [144kB]
+Get:66 http://cdn.debian.or.jp lenny/main libssl0.9.8 0.9.8e-5+b1 [921kB]
+Get:67 http://cdn.debian.or.jp lenny/main libusb-0.1-4 2:0.1.12-7 [20.4kB]
+Get:68 http://cdn.debian.or.jp lenny/main libwrap0 7.6.dbs-14 [30.8kB]
+Get:69 http://cdn.debian.or.jp lenny/main man-db 2.4.4-3 [765kB]
+Get:70 http://cdn.debian.or.jp lenny/main manpages 2.62-1 [516kB]
+Get:71 http://cdn.debian.or.jp lenny/main module-init-tools 3.3-pre11-4 [76.4kB]
+Get:72 http://cdn.debian.or.jp lenny/main nano 2.0.6-2 [572kB]
+Get:73 http://cdn.debian.or.jp lenny/main netbase 4.30 [18.0kB]
+Get:74 http://cdn.debian.or.jp lenny/main netcat 1.10-33 [68.3kB]
+Get:75 http://cdn.debian.or.jp lenny/main tasksel 2.68 [77.0kB]
+Get:76 http://cdn.debian.or.jp lenny/main tasksel-data 2.68 [350kB]
+Get:77 http://cdn.debian.or.jp lenny/main tcpd 7.6.dbs-14 [77.5kB]
+Get:78 http://cdn.debian.or.jp lenny/main vim-tiny 1:7.1-056+2 [371kB]
+Get:79 http://cdn.debian.or.jp lenny/main vim-common 1:7.1-056+2 [182kB]
+Get:80 http://cdn.debian.or.jp lenny/main wget 1.10.2-3 [624kB]
+Get:81 http://cdn.debian.or.jp lenny/main dselect 1.14.5 [513kB]
+
Extracting templates from packages: 37%
Extracting templates from packages: 74%
Extracting templates from packages: 100%
 Preconfiguring packages ...
 Fetched XXXB in Xs (XXXXXB/s)
 (Reading database ... 12033 files and directories currently installed.)
 Removing build-essential ...
 Removing g++ ...
+Removing libsasl2 ...
 Removing g++-4.1 ...
 Removing libstdc++6-4.1-dev ...
 Removing libc6-dev ...
 Selecting previously deselected package gcc-4.2-base.
-(Reading database ... 11053 files and directories currently installed.)
+(Reading database ... 11049 files and directories currently installed.)
 Unpacking gcc-4.2-base (from .../gcc-4.2-base_4.2-20070712-1_amd64.deb) ...
-Preparing to replace debconf-i18n 1.5.11 (using .../debconf-i18n_1.5.13_all.deb) ...
+Preparing to replace debconf-i18n 1.5.11 (using .../debconf-i18n_1.5.14_all.deb) ...
 Unpacking replacement debconf-i18n ...
-Preparing to replace debconf 1.5.11 (using .../debconf_1.5.13_all.deb) ...
+Preparing to replace debconf 1.5.11 (using .../debconf_1.5.14_all.deb) ...
 Unpacking replacement debconf ...
-Preparing to replace tzdata 2007b-1 (using .../tzdata_2007f-9_all.deb) ...
+Preparing to replace tzdata 2007b-1 (using .../tzdata_2007f-10_all.deb) ...
 Unpacking replacement tzdata ...
-Setting up debconf-i18n (1.5.13) ...
-Setting up debconf (1.5.13) ...
+Setting up debconf-i18n (1.5.14) ...
+Setting up debconf (1.5.14) ...
+Installing new version of config file /etc/bash_completion.d/debconf ...
 
-Setting up tzdata (2007f-9) ...
+Setting up tzdata (2007f-10) ...
 
 User defined timezone, leaving /etc/localtime unchanged.
 Local time is now: XXXX
@@ -134,45 +148,45 @@ Universal Time is now: XXXX
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
-(Reading database ... 11065 files and directories currently installed.)
-Preparing to replace libc6 2.3.6.ds1-13 (using .../archives/libc6_2.6-2_amd64.deb) ...
+(Reading database ... 11069 files and directories currently installed.)
+Preparing to replace libc6 2.3.6.ds1-13etch2 (using .../archives/libc6_2.6-2_amd64.deb) ...
 Unpacking replacement libc6 ...
 Setting up libc6 (2.6-2) ...
 Installing new version of config file /etc/init.d/glibc.sh ...
 
-(Reading database ... 11112 files and directories currently installed.)
+(Reading database ... 11116 files and directories currently installed.)
 Preparing to replace libgcc1 1:4.1.1-21 (using .../libgcc1_1%3a4.2-20070712-1_amd64.deb) ...
 Unpacking replacement libgcc1 ...
 Setting up gcc-4.2-base (4.2-20070712-1) ...
 
 Setting up libgcc1 (4.2-20070712-1) ...
 
-(Reading database ... 11112 files and directories currently installed.)
+(Reading database ... 11116 files and directories currently installed.)
 Preparing to replace libstdc++6 4.1.1-21 (using .../libstdc++6_4.2-20070712-1_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.2-20070712-1) ...
 
-(Reading database ... 11112 files and directories currently installed.)
+(Reading database ... 11116 files and directories currently installed.)
 Preparing to replace gcc-4.1 4.1.1-21 (using .../gcc-4.1_4.1.2-13_amd64.deb) ...
 Unpacking replacement gcc-4.1 ...
 Preparing to replace cpp-4.1 4.1.1-21 (using .../cpp-4.1_4.1.2-13_amd64.deb) ...
 Unpacking replacement cpp-4.1 ...
-(Reading database ... 11114 files and directories currently installed.)
+(Reading database ... 11118 files and directories currently installed.)
 Removing libssp0 ...
-(Reading database ... 11111 files and directories currently installed.)
+(Reading database ... 11115 files and directories currently installed.)
 Preparing to replace gcc-4.1-base 4.1.1-21 (using .../gcc-4.1-base_4.1.2-13_amd64.deb) ...
 Unpacking replacement gcc-4.1-base ...
-Preparing to replace binutils 2.17-3 (using .../binutils_2.17cvs20070718-1_amd64.deb) ...
+Preparing to replace binutils 2.17-3 (using .../binutils_2.17cvs20070804-1_amd64.deb) ...
 Unpacking replacement binutils ...
-Preparing to replace debianutils 2.17 (using .../debianutils_2.22.1_amd64.deb) ...
+Preparing to replace debianutils 2.17 (using .../debianutils_2.23.1_amd64.deb) ...
 Unpacking replacement debianutils ...
-Setting up debianutils (2.22.1) ...
+Setting up debianutils (2.23.1) ...
 
-(Reading database ... 11116 files and directories currently installed.)
+(Reading database ... 11120 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.1-12_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.1-12) ...
-(Reading database ... 11116 files and directories currently installed.)
+(Reading database ... 11120 files and directories currently installed.)
 Preparing to replace cpio 2.6-17 (using .../archives/cpio_2.7-3_amd64.deb) ...
 Unpacking replacement cpio ...
 Preparing to replace make 3.81-2 (using .../archives/make_3.81-3_amd64.deb) ...
@@ -183,46 +197,64 @@ Preparing to replace dpkg 1.13.25 (using .../archives/dpkg_1.14.5_amd64.deb) ...
 Unpacking replacement dpkg ...
 Setting up dpkg (1.14.5) ...
 
-(Reading database ... 11104 files and directories currently installed.)
+(Reading database ... 11106 files and directories currently installed.)
 Preparing to replace findutils 4.2.28-1 (using .../findutils_4.2.31-1_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.31-1) ...
 
-(Reading database ... 11104 files and directories currently installed.)
+(Reading database ... 11106 files and directories currently installed.)
 Preparing to replace gzip 1.3.5-15 (using .../gzip_1.3.12-3_amd64.deb) ...
 Unpacking replacement gzip ...
 Setting up gzip (1.3.12-3) ...
 
-(Reading database ... 11105 files and directories currently installed.)
+(Reading database ... 11107 files and directories currently installed.)
 Preparing to replace login 1:4.0.18.1-7 (using .../login_1%3a4.0.18.1-11_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (1:4.0.18.1-11) ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11105 files and directories currently installed.)
+(Reading database ... 11107 files and directories currently installed.)
 Preparing to replace mktemp 1.5-2 (using .../mktemp_1.5-3_amd64.deb) ...
 Unpacking replacement mktemp ...
 Setting up mktemp (1.5-3) ...
-(Reading database ... 11105 files and directories currently installed.)
+(Reading database ... 11107 files and directories currently installed.)
 Preparing to replace libncurses5 5.5-5 (using .../libncurses5_5.6+20070716-1_amd64.deb) ...
 Unpacking replacement libncurses5 ...
 Setting up libncurses5 (5.6+20070716-1) ...
 
-(Reading database ... 11105 files and directories currently installed.)
+(Reading database ... 11107 files and directories currently installed.)
 Preparing to replace ncurses-bin 5.5-5 (using .../ncurses-bin_5.6+20070716-1_amd64.deb) ...
 Unpacking replacement ncurses-bin ...
 Setting up ncurses-bin (5.6+20070716-1) ...
-(Reading database ... 11105 files and directories currently installed.)
+(Reading database ... 11107 files and directories currently installed.)
 Preparing to replace sed 4.1.5-1 (using .../archives/sed_4.1.5-2_amd64.deb) ...
 Unpacking replacement sed ...
 Setting up sed (4.1.5-2) ...
 
-(Reading database ... 11105 files and directories currently installed.)
+(Reading database ... 11107 files and directories currently installed.)
+Preparing to replace libsepol1 1.14-2 (using .../libsepol1_2.0.3-1+b1_amd64.deb) ...
+Unpacking replacement libsepol1 ...
+Setting up libsepol1 (2.0.3-1+b1) ...
+telinit: timeout opening/writing control channel /dev/initctl
+
+(Reading database ... 11107 files and directories currently installed.)
+Preparing to replace libselinux1 1.32-3 (using .../libselinux1_2.0.15-2+b1_amd64.deb) ...
+Unpacking replacement libselinux1 ...
+Setting up libselinux1 (2.0.15-2+b1) ...
+init: timeout opening/writing control channel /dev/initctl
+
+(Reading database ... 11107 files and directories currently installed.)
+Preparing to replace sysvinit 2.86.ds1-38 (using .../sysvinit_2.86.ds1-38.1_amd64.deb) ...
+Unpacking replacement sysvinit ...
+Setting up sysvinit (2.86.ds1-38.1) ...
+init: timeout opening/writing control channel /dev/initctl
+
+(Reading database ... 11107 files and directories currently installed.)
 Preparing to replace tar 1.16-2 (using .../tar_1.16.1-1_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.16.1-1) ...
 
-(Reading database ... 11106 files and directories currently installed.)
+(Reading database ... 11108 files and directories currently installed.)
 Preparing to replace base-files 4 (using .../base-files_4.0.0_amd64.deb) ...
 Unpacking replacement base-files ...
 Setting up base-files (4.0.0) ...
@@ -230,28 +262,33 @@ 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 ... 11108 files and directories currently installed.)
+(Reading database ... 11110 files and directories currently installed.)
 Preparing to replace ncurses-base 5.5-5 (using .../ncurses-base_5.6+20070716-1_all.deb) ...
 Unpacking replacement ncurses-base ...
 Setting up ncurses-base (5.6+20070716-1) ...
 Installing new version of config file /etc/terminfo/README ...
-(Reading database ... 11108 files and directories currently installed.)
+(Reading database ... 11110 files and directories currently installed.)
+Preparing to replace sysvinit-utils 2.86.ds1-38 (using .../sysvinit-utils_2.86.ds1-38.1_amd64.deb) ...
+Unpacking replacement sysvinit-utils ...
+Setting up sysvinit-utils (2.86.ds1-38.1) ...
+(Reading database ... 11110 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.46.4-0.1 (using .../apt-utils_0.7.3_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace libncursesw5 5.5-5 (using .../libncursesw5_5.6+20070716-1_amd64.deb) ...
 Unpacking replacement libncursesw5 ...
 Preparing to replace aptitude 0.4.4-4 (using .../aptitude_0.4.5.4-1_amd64.deb) ...
 Unpacking replacement aptitude ...
-Preparing to replace debian-archive-keyring 2007.02.19 (using .../debian-archive-keyring_2007.02.19-0.1_all.deb) ...
+Preparing to replace debian-archive-keyring 2007.07.31~etch1 (using .../debian-archive-keyring_2007.07.31_all.deb) ...
 Unpacking replacement debian-archive-keyring ...
-Setting up debian-archive-keyring (2007.02.19-0.1) ...
+Setting up debian-archive-keyring (2007.07.31) ...
 gpg: key 2D230C5F: "Debian Archive Automatic Signing Key (2006) <ftpmaster@debian.org>" not changed
 gpg: key 6070D3A1: "Debian Archive Automatic Signing Key (4.0/etch) <ftpmaster@debian.org>" not changed
 gpg: key ADB11277: "Etch Stable Release Key <debian-release@lists.debian.org>" not changed
-gpg: Total number processed: 3
-gpg:              unchanged: 3
+gpg: key BBE55AB3: "Debian-Volatile Archive Automatic Signing Key (4.0/etch)" not changed
+gpg: Total number processed: 4
+gpg:              unchanged: 4
 
-(Reading database ... 11109 files and directories currently installed.)
+(Reading database ... 11111 files and directories currently installed.)
 Preparing to replace apt 0.6.46.4-0.1 (using .../archives/apt_0.7.3_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.7.3) ...
@@ -259,61 +296,68 @@ Installing new version of config file /etc/cron.daily/apt ...
 gpg: key 2D230C5F: "Debian Archive Automatic Signing Key (2006) <ftpmaster@debian.org>" not changed
 gpg: key 6070D3A1: "Debian Archive Automatic Signing Key (4.0/etch) <ftpmaster@debian.org>" not changed
 gpg: key ADB11277: "Etch Stable Release Key <debian-release@lists.debian.org>" not changed
-gpg: Total number processed: 3
-gpg:              unchanged: 3
-
-(Reading database ... 11117 files and directories currently installed.)
-Preparing to replace libattr1 2.4.32-1 (using .../libattr1_1%3a2.4.32-1.1_amd64.deb) ...
+gpg: key BBE55AB3: "Debian-Volatile Archive Automatic Signing Key (4.0/etch)" not changed
+gpg: Total number processed: 4
+gpg:              unchanged: 4
+
+(Reading database ... 11119 files and directories currently installed.)
+Preparing to replace lsb-base 3.1-23.2etch1 (using .../lsb-base_3.1-24_all.deb) ...
+Unpacking replacement lsb-base ...
+Setting up lsb-base (3.1-24) ...
+(Reading database ... 11119 files and directories currently installed.)
+Preparing to replace initscripts 2.86.ds1-38 (using .../initscripts_2.86.ds1-38.1_amd64.deb) ...
+Unpacking replacement initscripts ...
+Setting up initscripts (2.86.ds1-38.1) ...
+Installing new version of config file /etc/network/if-up.d/mountnfs ...
+
+(Reading database ... 11119 files and directories currently installed.)
+Preparing to replace libattr1 2.4.32-1 (using .../libattr1_1%3a2.4.32-1.2_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.41-1 (using .../libacl1_2.2.42-1_amd64.deb) ...
 Unpacking replacement libacl1 ...
-Setting up libattr1 (1:2.4.32-1.1) ...
+Setting up libattr1 (1:2.4.32-1.2) ...
 
 Setting up libacl1 (2.2.42-1) ...
 
-(Reading database ... 11117 files and directories currently installed.)
-Preparing to replace libsepol1 1.14-2 (using .../libsepol1_2.0.3-1+b1_amd64.deb) ...
-Unpacking replacement libsepol1 ...
-Setting up libsepol1 (2.0.3-1+b1) ...
-telinit: timeout opening/writing control channel /dev/initctl
-
-(Reading database ... 11117 files and directories currently installed.)
-Preparing to replace libselinux1 1.32-3 (using .../libselinux1_2.0.15-2+b1_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (2.0.15-2+b1) ...
-init: timeout opening/writing control channel /dev/initctl
-
-(Reading database ... 11117 files and directories currently installed.)
-Preparing to replace libslang2 2.0.6-4 (using .../libslang2_2.0.7-1_amd64.deb) ...
+(Reading database ... 11119 files and directories currently installed.)
+Preparing to replace libslang2 2.0.6-4 (using .../libslang2_2.0.7-3_amd64.deb) ...
 Unpacking replacement libslang2 ...
-Setting up libslang2 (2.0.7-1) ...
+Setting up libslang2 (2.0.7-3) ...
 
-(Reading database ... 11117 files and directories currently installed.)
+(Reading database ... 11119 files and directories currently installed.)
+Preparing to replace sysv-rc 2.86.ds1-38 (using .../sysv-rc_2.86.ds1-38.1_all.deb) ...
+Unpacking replacement sysv-rc ...
+Setting up sysv-rc (2.86.ds1-38.1) ...
+(Reading database ... 11119 files and directories currently installed.)
 Preparing to replace zlib1g 1:1.2.3-13 (using .../zlib1g_1%3a1.2.3.3.dfsg-5_amd64.deb) ...
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1:1.2.3.3.dfsg-5) ...
 
-(Reading database ... 11115 files and directories currently installed.)
+(Reading database ... 11117 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.18.1-7 (using .../passwd_1%3a4.0.18.1-11_amd64.deb) ...
 Unpacking replacement passwd ...
 Preparing to replace adduser 3.102 (using .../archives/adduser_3.104_all.deb) ...
 Unpacking replacement adduser ...
-Preparing to replace dhcp3-client 3.0.4-13 (using .../dhcp3-client_3.0.5-3_amd64.deb) ...
+Preparing to replace dhcp3-client 3.0.4-13 (using .../dhcp3-client_3.0.6-1_amd64.deb) ...
 Unpacking replacement dhcp3-client ...
-Preparing to replace dhcp3-common 3.0.4-13 (using .../dhcp3-common_3.0.5-3_amd64.deb) ...
+Preparing to replace dhcp3-common 3.0.4-13 (using .../dhcp3-common_3.0.6-1_amd64.deb) ...
 Unpacking replacement dhcp3-common ...
 Preparing to replace dmidecode 2.8-4 (using .../dmidecode_2.9-1_amd64.deb) ...
 Unpacking replacement dmidecode ...
 Preparing to replace info 4.8.dfsg.1-4 (using .../info_4.8.dfsg.1-6_amd64.deb) ...
 Unpacking replacement info ...
+Preparing to replace iptables 1.3.6.0debian1-5 (using .../iptables_1.3.8.0debian1-1_amd64.deb) ...
+Unpacking replacement iptables ...
 Preparing to replace iputils-ping 3:20020927-6 (using .../iputils-ping_3%3a20070202-2_amd64.deb) ...
 Unpacking replacement iputils-ping ...
-Preparing to replace sysklogd 1.4.1-18 (using .../sysklogd_1.4.1-20_amd64.deb) ...
+Preparing to replace sysklogd 1.4.1-18 (using .../sysklogd_1.5-1_amd64.deb) ...
 Unpacking replacement sysklogd ...
-Preparing to replace klogd 1.4.1-18 (using .../klogd_1.4.1-20_amd64.deb) ...
+Preparing to replace klogd 1.4.1-18 (using .../archives/klogd_1.5-1_amd64.deb) ...
 Unpacking replacement klogd ...
 Preparing to replace laptop-detect 0.12.1 (using .../laptop-detect_0.12.1-0.1_amd64.deb) ...
 Unpacking replacement laptop-detect ...
+Preparing to replace libbz2-1.0 1.0.3-6 (using .../libbz2-1.0_1.0.3-7_amd64.deb) ...
+Unpacking replacement libbz2-1.0 ...
 Preparing to replace libgpg-error0 1.4-1 (using .../libgpg-error0_1.4-2_amd64.deb) ...
 Unpacking replacement libgpg-error0 ...
 Preparing to replace libgcrypt11 1.2.3-2 (using .../libgcrypt11_1.2.4-2_amd64.deb) ...
@@ -326,6 +370,8 @@ Preparing to replace libtasn1-3 0.3.6-2 (using .../libtasn1-3_0.3.9-1_amd64.deb)
 Unpacking replacement libtasn1-3 ...
 Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.6.3-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
+Preparing to replace libsasl2-2 2.1.22.dfsg1-8 (using .../libsasl2-2_2.1.22.dfsg1-13_amd64.deb) ...
+Unpacking replacement libsasl2-2 ...
 Preparing to replace libldap2 2.1.30-13.3 (using .../libldap2_2.1.30-13.4_amd64.deb) ...
 Unpacking replacement libldap2 ...
 Preparing to replace readline-common 5.2-2 (using .../readline-common_5.2-3_all.deb) ...
@@ -336,23 +382,29 @@ Preparing to replace libssl0.9.8 0.9.8c-4 (using .../libssl0.9.8_0.9.8e-5+b1_amd
 Unpacking replacement libssl0.9.8 ...
 Preparing to replace libusb-0.1-4 2:0.1.12-5 (using .../libusb-0.1-4_2%3a0.1.12-7_amd64.deb) ...
 Unpacking replacement libusb-0.1-4 ...
+Preparing to replace libwrap0 7.6.dbs-13 (using .../libwrap0_7.6.dbs-14_amd64.deb) ...
+Unpacking replacement libwrap0 ...
 Preparing to replace man-db 2.4.3-6 (using .../man-db_2.4.4-3_amd64.deb) ...
 Unpacking replacement man-db ...
-Preparing to replace manpages 2.39-1 (using .../manpages_2.57-1_all.deb) ...
+Preparing to replace manpages 2.39-1 (using .../manpages_2.62-1_all.deb) ...
 Unpacking replacement manpages ...
 Preparing to replace module-init-tools 3.3-pre4-2 (using .../module-init-tools_3.3-pre11-4_amd64.deb) ...
 Unpacking replacement module-init-tools ...
-Preparing to replace nano 2.0.2-1 (using .../nano_2.0.3-1_amd64.deb) ...
+Preparing to replace nano 2.0.2-1etch1 (using .../nano_2.0.6-2_amd64.deb) ...
 Unpacking replacement nano ...
+Preparing to replace netbase 4.29 (using .../archives/netbase_4.30_all.deb) ...
+Unpacking replacement netbase ...
 Preparing to replace netcat 1.10-32 (using .../netcat_1.10-33_amd64.deb) ...
 Unpacking replacement netcat ...
 Preparing to replace tasksel 2.66 (using .../archives/tasksel_2.68_all.deb) ...
 Unpacking replacement tasksel ...
 Preparing to replace tasksel-data 2.66 (using .../tasksel-data_2.68_all.deb) ...
 Unpacking replacement tasksel-data ...
-Preparing to replace vim-tiny 1:7.0-122+1etch2 (using .../vim-tiny_1%3a7.1-022+1_amd64.deb) ...
+Preparing to replace tcpd 7.6.dbs-13 (using .../tcpd_7.6.dbs-14_amd64.deb) ...
+Unpacking replacement tcpd ...
+Preparing to replace vim-tiny 1:7.0-122+1etch2 (using .../vim-tiny_1%3a7.1-056+2_amd64.deb) ...
 Unpacking replacement vim-tiny ...
-Preparing to replace vim-common 1:7.0-122+1etch2 (using .../vim-common_1%3a7.1-022+1_amd64.deb) ...
+Preparing to replace vim-common 1:7.0-122+1etch2 (using .../vim-common_1%3a7.1-056+2_amd64.deb) ...
 Unpacking replacement vim-common ...
 Preparing to replace wget 1.10.2-2 (using .../wget_1.10.2-3_amd64.deb) ...
 Unpacking replacement wget ...
@@ -361,7 +413,7 @@ Unpacking replacement dselect ...
 Setting up gcc-4.1-base (4.1.2-13) ...
 
 Setting up cpp-4.1 (4.1.2-13) ...
-Setting up binutils (2.17cvs20070718-1) ...
+Setting up binutils (2.17cvs20070804-1) ...
 
 Setting up gcc-4.1 (4.1.2-13) ...
 Setting up cpio (2.7-3) ...
@@ -379,14 +431,18 @@ Installing new version of config file /etc/default/useradd ...
 
 Setting up adduser (3.104) ...
 
-Setting up dhcp3-common (3.0.5-3) ...
-Setting up dhcp3-client (3.0.5-3) ...
+Setting up dhcp3-common (3.0.6-1) ...
+Setting up dhcp3-client (3.0.6-1) ...
 
 Setting up dmidecode (2.9-1) ...
 Setting up info (4.8.dfsg.1-6) ...
 
+Setting up iptables (1.3.8.0debian1-1) ...
+
 Setting up iputils-ping (3:20070202-2) ...
 Setting up laptop-detect (0.12.1-0.1) ...
+Setting up libbz2-1.0 (1.0.3-7) ...
+
 Setting up libgpg-error0 (1.4-2) ...
 
 Setting up libgcrypt11 (1.2.4-2) ...
@@ -399,6 +455,8 @@ Setting up libtasn1-3 (0.3.9-1) ...
 
 Setting up libgnutls13 (1.6.3-1) ...
 
+Setting up libsasl2-2 (2.1.22.dfsg1-13) ...
+
 Setting up libldap2 (2.1.30-13.4) ...
 
 Setting up readline-common (5.2-3) ...
@@ -409,29 +467,39 @@ Setting up libssl0.9.8 (0.9.8e-5+b1) ...
 
 Setting up libusb-0.1-4 (2:0.1.12-7) ...
 
+Setting up libwrap0 (7.6.dbs-14) ...
+
 Setting up man-db (2.4.4-3) ...
 
-Setting up manpages (2.57-1) ...
+Setting up manpages (2.62-1) ...
 Setting up module-init-tools (3.3-pre11-4) ...
 
-Setting up nano (2.0.3-1) ...
+Setting up nano (2.0.6-2) ...
+
+Setting up netbase (4.30) ...
+Installing new version of config file /etc/protocols ...
 
 Setting up netcat (1.10-33) ...
-Setting up vim-common (1:7.1-022+1) ...
+Setting up tcpd (7.6.dbs-14) ...
+
+Setting up vim-common (1:7.1-056+2) ...
+Installing new version of config file /etc/vim/vimrc.tiny ...
 
-Setting up vim-tiny (1:7.1-022+1) ...
+Setting up vim-tiny (1:7.1-056+2) ...
 
 Setting up wget (1.10.2-3) ...
 
 Setting up dselect (1.14.5) ...
-Setting up sysklogd (1.4.1-20) ...
+Setting up sysklogd (1.5-1) ...
+Installing new version of config file /etc/syslog.conf ...
 Installing new version of config file /etc/init.d/sysklogd ...
 Installing new version of config file /etc/cron.daily/sysklogd ...
+Installing new version of config file /etc/cron.weekly/sysklogd ...
 
 Setting up tasksel-data (2.68) ...
 Setting up tasksel (2.68) ...
 
-Setting up klogd (1.4.1-20) ...
+Setting up klogd (1.5-1) ...
 Installing new version of config file /etc/init.d/klogd ...
 
 Reading package lists...
@@ -456,10 +524,10 @@ Get:4 http://cdn.debian.or.jp lenny/main g++-4.1 4.1.2-13 [2822kB]
 Get:5 http://cdn.debian.or.jp lenny/main g++ 4:4.1.1-15 [1358B]
 Get:6 http://cdn.debian.or.jp lenny/main build-essential 11.3 [6982B]
 Fetched XXXB in Xs (XXXXXB/s)
-(Reading database ... 11093 files and directories currently installed.)
+(Reading database ... 11094 files and directories currently installed.)
 Removing linux-kernel-headers ...
 Selecting previously deselected package linux-libc-dev.
-(Reading database ... 9368 files and directories currently installed.)
+(Reading database ... 9369 files and directories currently installed.)
 Unpacking linux-libc-dev (from .../linux-libc-dev_2.6.21-6_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
 Unpacking libc6-dev (from .../libc6-dev_2.6-2_amd64.deb) ...
diff --git a/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
index 41240e3..15f5218 100644
--- a/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
@@ -15,7 +15,7 @@ Get:2 http://cdn.debian.or.jp experimental Release.gpg [189B]
 Hit http://cdn.debian.or.jp sid Release
 Get:3 http://cdn.debian.or.jp experimental Release [79.6kB]
 Get:4 http://cdn.debian.or.jp sid/main Packages/DiffIndex [2038B]
-Get:5 http://cdn.debian.or.jp experimental/main Packages [244kB]
+Get:5 http://cdn.debian.or.jp experimental/main Packages [274kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -26,35 +26,58 @@ The following NEW packages will be installed:
   cpp-4.2 g++-4.2 gcc-4.2 iproute libatm1 libgomp1 libopencdk10
   libstdc++6-4.2-dev
 The following packages will be upgraded:
-  cpp findutils g++ gcc ifupdown libgcrypt11 libgnutls13 wget
-8 upgraded, 8 newly installed, 0 to remove and 0 not upgraded.
-Need to get 9919kB of archives.
-After unpacking 25.7MB of additional disk space will be used.
+  cpp findutils g++ gcc ifupdown libgcrypt11 libgnutls13 libpam-modules
+  libpam-runtime libpam0g wget
+11 upgraded, 8 newly installed, 0 to remove and 0 not upgraded.
+Need to get 10.4MB of archives.
+After unpacking 26.3MB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp experimental/main findutils 4.3.8-1 [631kB]
-Get:2 http://cdn.debian.or.jp sid/main libatm1 2.4.1-17.1 [69.8kB]
-Get:3 http://cdn.debian.or.jp sid/main iproute 20070313-1 [360kB]
-Get:4 http://cdn.debian.or.jp experimental/main ifupdown 0.7~alpha2 [53.0kB]
-Get:5 http://cdn.debian.or.jp experimental/main libgcrypt11 1.3.0-1 [233kB]
-Get:6 http://cdn.debian.or.jp sid/main libopencdk10 0.6.4-1 [86.1kB]
-Get:7 http://cdn.debian.or.jp experimental/main libgnutls13 1.7.14-1 [393kB]
-Get:8 http://cdn.debian.or.jp experimental/main wget 1.10.2+1.11.beta1-1 [635kB]
-Get:9 http://cdn.debian.or.jp sid/main cpp-4.2 4.2.1-1 [2704kB]
-Get:10 http://cdn.debian.or.jp experimental/main cpp 4:4.2.0-1 [12.0kB]
-Get:11 http://cdn.debian.or.jp sid/main libgomp1 4.2.1-1 [13.4kB]
-Get:12 http://cdn.debian.or.jp sid/main gcc-4.2 4.2.1-1 [484kB]
-Get:13 http://cdn.debian.or.jp experimental/main gcc 4:4.2.0-1 [5066B]
-Get:14 http://cdn.debian.or.jp sid/main libstdc++6-4.2-dev 4.2.1-1 [1213kB]
-Get:15 http://cdn.debian.or.jp sid/main g++-4.2 4.2.1-1 [3024kB]
-Get:16 http://cdn.debian.or.jp experimental/main g++ 4:4.2.0-1 [1376B]
+Get:2 http://cdn.debian.or.jp experimental/main libpam-runtime 0.99.7.1-1 [95.1kB]
+Get:3 http://cdn.debian.or.jp experimental/main libpam0g 0.99.7.1-1 [74.0kB]
+Get:4 http://cdn.debian.or.jp experimental/main libpam-modules 0.99.7.1-1 [260kB]
+Get:5 http://cdn.debian.or.jp sid/main libatm1 2.4.1-17.1 [69.8kB]
+Get:6 http://cdn.debian.or.jp sid/main iproute 20070313-1 [360kB]
+Get:7 http://cdn.debian.or.jp experimental/main ifupdown 0.7~alpha2 [53.0kB]
+Get:8 http://cdn.debian.or.jp experimental/main libgcrypt11 1.3.0-1 [233kB]
+Get:9 http://cdn.debian.or.jp sid/main libopencdk10 0.6.4-1 [86.1kB]
+Get:10 http://cdn.debian.or.jp experimental/main libgnutls13 1.7.16-1 [396kB]
+Get:11 http://cdn.debian.or.jp experimental/main wget 1.10.2+1.11.beta1-1 [635kB]
+Get:12 http://cdn.debian.or.jp sid/main cpp-4.2 4.2.1-4 [2706kB]
+Get:13 http://cdn.debian.or.jp experimental/main cpp 4:4.2.0-1 [12.0kB]
+Get:14 http://cdn.debian.or.jp sid/main libgomp1 4.2.1-4 [13.4kB]
+Get:15 http://cdn.debian.or.jp sid/main gcc-4.2 4.2.1-4 [485kB]
+Get:16 http://cdn.debian.or.jp experimental/main gcc 4:4.2.0-1 [5066B]
+Get:17 http://cdn.debian.or.jp sid/main libstdc++6-4.2-dev 4.2.1-4 [1213kB]
+Get:18 http://cdn.debian.or.jp sid/main g++-4.2 4.2.1-4 [3025kB]
+Get:19 http://cdn.debian.or.jp experimental/main g++ 4:4.2.0-1 [1376B]
 Preconfiguring packages ...
 Fetched XXXB in Xs (XXXXXB/s)
-(Reading database ... 11093 files and directories currently installed.)
+(Reading database ... 11101 files and directories currently installed.)
 Preparing to replace findutils 4.2.31-1 (using .../findutils_4.3.8-1_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.3.8-1) ...
 
+(Reading database ... 11103 files and directories currently installed.)
+Preparing to replace libpam-runtime 0.79-4 (using .../libpam-runtime_0.99.7.1-1_all.deb) ...
+Unpacking replacement libpam-runtime ...
+Setting up libpam-runtime (0.99.7.1-1) ...
+
+(Reading database ... 11125 files and directories currently installed.)
+Preparing to replace libpam0g 0.79-4 (using .../libpam0g_0.99.7.1-1_amd64.deb) ...
+Unpacking replacement libpam0g ...
+Setting up libpam0g (0.99.7.1-1) ...
+
+(Reading database ... 11125 files and directories currently installed.)
+Preparing to replace libpam-modules 0.79-4 (using .../libpam-modules_0.99.7.1-1_amd64.deb) ...
+Unpacking replacement libpam-modules ...
+Setting up libpam-modules (0.99.7.1-1) ...
+Installing new version of config file /etc/security/access.conf ...
+Installing new version of config file /etc/security/group.conf ...
+Installing new version of config file /etc/security/limits.conf ...
+Installing new version of config file /etc/security/pam_env.conf ...
+Installing new version of config file /etc/security/time.conf ...
 Selecting previously deselected package libatm1.
-(Reading database ... 11095 files and directories currently installed.)
+(Reading database ... 11180 files and directories currently installed.)
 Unpacking libatm1 (from .../libatm1_2.4.1-17.1_amd64.deb) ...
 Selecting previously deselected package iproute.
 Unpacking iproute (from .../iproute_20070313-1_amd64.deb) ...
@@ -64,25 +87,25 @@ Preparing to replace libgcrypt11 1.2.4-2 (using .../libgcrypt11_1.3.0-1_amd64.de
 Unpacking replacement libgcrypt11 ...
 Selecting previously deselected package libopencdk10.
 Unpacking libopencdk10 (from .../libopencdk10_0.6.4-1_amd64.deb) ...
-Preparing to replace libgnutls13 1.6.3-1 (using .../libgnutls13_1.7.14-1_amd64.deb) ...
+Preparing to replace libgnutls13 1.6.3-1 (using .../libgnutls13_1.7.16-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
 Preparing to replace wget 1.10.2-3 (using .../wget_1.10.2+1.11.beta1-1_amd64.deb) ...
 Unpacking replacement wget ...
 Selecting previously deselected package cpp-4.2.
-Unpacking cpp-4.2 (from .../cpp-4.2_4.2.1-1_amd64.deb) ...
+Unpacking cpp-4.2 (from .../cpp-4.2_4.2.1-4_amd64.deb) ...
 Preparing to replace cpp 4:4.1.2-3 (using .../cpp_4%3a4.2.0-1_amd64.deb) ...
 Unpacking replacement cpp ...
 Selecting previously deselected package libgomp1.
-Unpacking libgomp1 (from .../libgomp1_4.2.1-1_amd64.deb) ...
+Unpacking libgomp1 (from .../libgomp1_4.2.1-4_amd64.deb) ...
 Selecting previously deselected package gcc-4.2.
-Unpacking gcc-4.2 (from .../gcc-4.2_4.2.1-1_amd64.deb) ...
+Unpacking gcc-4.2 (from .../gcc-4.2_4.2.1-4_amd64.deb) ...
 Preparing to replace gcc 4:4.1.2-3 (using .../gcc_4%3a4.2.0-1_amd64.deb) ...
 Removing old gcc doc directory.
 Unpacking replacement gcc ...
 Selecting previously deselected package libstdc++6-4.2-dev.
-Unpacking libstdc++6-4.2-dev (from .../libstdc++6-4.2-dev_4.2.1-1_amd64.deb) ...
+Unpacking libstdc++6-4.2-dev (from .../libstdc++6-4.2-dev_4.2.1-4_amd64.deb) ...
 Selecting previously deselected package g++-4.2.
-Unpacking g++-4.2 (from .../g++-4.2_4.2.1-1_amd64.deb) ...
+Unpacking g++-4.2 (from .../g++-4.2_4.2.1-4_amd64.deb) ...
 Preparing to replace g++ 4:4.1.2-3 (using .../g++_4%3a4.2.0-1_amd64.deb) ...
 Unpacking replacement g++ ...
 Setting up libatm1 (2.4.1-17.1) ...
@@ -96,20 +119,20 @@ Setting up libgcrypt11 (1.3.0-1) ...
 
 Setting up libopencdk10 (0.6.4-1) ...
 
-Setting up libgnutls13 (1.7.14-1) ...
+Setting up libgnutls13 (1.7.16-1) ...
 
 Setting up wget (1.10.2+1.11.beta1-1) ...
 
-Setting up cpp-4.2 (4.2.1-1) ...
+Setting up cpp-4.2 (4.2.1-4) ...
 Setting up cpp (4:4.2.0-1) ...
 
-Setting up libgomp1 (4.2.1-1) ...
+Setting up libgomp1 (4.2.1-4) ...
 
-Setting up gcc-4.2 (4.2.1-1) ...
+Setting up gcc-4.2 (4.2.1-4) ...
 Setting up gcc (4:4.2.0-1) ...
 
-Setting up g++-4.2 (4.2.1-1) ...
-Setting up libstdc++6-4.2-dev (4.2.1-1) ...
+Setting up g++-4.2 (4.2.1-4) ...
+Setting up libstdc++6-4.2-dev (4.2.1-4) ...
 Setting up g++ (4:4.2.0-1) ...
 
 Reading package lists...
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index 98e0e2a..1a0f901 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -11,195 +11,177 @@ 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 [6278kB]
+Get:3 http://cdn.debian.or.jp sid/main Packages [6291kB]
 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...
 Reading state information...
-The following packages will be REMOVED:
-  libsasl2
 The following NEW packages will be installed:
   libdevmapper1.02.1 libvolume-id0
 The following packages will be upgraded:
-  apt apt-utils aptitude bsdutils cpio cpp cpp-4.1 debconf debconf-i18n
-  debian-archive-keyring dhcp3-client dhcp3-common e2fslibs e2fsprogs g++
-  g++-4.1 gcc gcc-4.1 gcc-4.1-base gcc-4.2-base initscripts iptables klogd
-  laptop-detect libattr1 libblkid1 libbz2-1.0 libc6 libc6-dev libcomerr2
-  libdb4.2 libgcc1 libsasl2-2 libslang2 libss2 libstdc++6 libstdc++6-4.1-dev
-  libuuid1 libwrap0 linux-libc-dev lsb-base manpages mount nano netbase
-  sysklogd sysv-rc sysvinit sysvinit-utils tcpd tzdata util-linux
-52 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
-Need to get 26.8MB of archives.
-After unpacking 1126kB of additional disk space will be used.
-Get:1 http://cdn.debian.or.jp sid/main bsdutils 1:2.13~rc2-4 [54.9kB]
-Get:2 http://cdn.debian.or.jp sid/main linux-libc-dev 2.6.22-3 [699kB]
-Get:3 http://cdn.debian.or.jp sid/main libc6-dev 2.6-5 [2485kB]
-Get:4 http://cdn.debian.or.jp sid/main gcc-4.2-base 4.2.1-1 [211kB]
-Get:5 http://cdn.debian.or.jp sid/main libgcc1 1:4.2.1-1 [26.7kB]
-Get:6 http://cdn.debian.or.jp sid/main libstdc++6 4.2.1-1 [313kB]
-Get:7 http://cdn.debian.or.jp sid/main libc6 2.6-5 [4768kB]
-Get:8 http://cdn.debian.or.jp sid/main e2fslibs 1.40.2-1 [113kB]
-Get:9 http://cdn.debian.or.jp sid/main e2fsprogs 1.40.2-1 [621kB]
-Get:10 http://cdn.debian.or.jp sid/main libvolume-id0 0.113-3 [69.9kB]
-Get:11 http://cdn.debian.or.jp sid/main mount 2.13~rc2-4 [133kB]
-Get:12 http://cdn.debian.or.jp sid/main sysvinit 2.86.ds1-38.1 [112kB]
-Get:13 http://cdn.debian.or.jp sid/main lsb-base 3.1-24 [16.9kB]
-Get:14 http://cdn.debian.or.jp sid/main debconf-i18n 1.5.14 [160kB]
-Get:15 http://cdn.debian.or.jp sid/main debconf 1.5.14 [150kB]
-Get:16 http://cdn.debian.or.jp sid/main tzdata 2007f-10 [729kB]
-Get:17 http://cdn.debian.or.jp sid/main util-linux 2.13~rc2-4 [424kB]
-Get:18 http://cdn.debian.or.jp sid/main sysvinit-utils 2.86.ds1-38.1 [67.5kB]
-Get:19 http://cdn.debian.or.jp sid/main apt-utils 0.7.4 [195kB]
-Get:20 http://cdn.debian.or.jp sid/main aptitude 0.4.6.1-1 [3000kB]
-Get:21 http://cdn.debian.or.jp sid/main debian-archive-keyring 2007.07.31 [9292B]
-Get:22 http://cdn.debian.or.jp sid/main apt 0.7.4 [1467kB]
-Get:23 http://cdn.debian.or.jp sid/main initscripts 2.86.ds1-38.1 [60.1kB]
-Get:24 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.20-2 [52.1kB]
-Get:25 http://cdn.debian.or.jp sid/main libblkid1 1.40.2-1 [47.0kB]
-Get:26 http://cdn.debian.or.jp sid/main libcomerr2 1.40.2-1 [34.1kB]
-Get:27 http://cdn.debian.or.jp sid/main libslang2 2.0.7-3 [457kB]
+  apt apt-utils aptitude base-passwd binutils bsdutils cpio cpp cpp-4.1
+  e2fslibs e2fsprogs ed g++ g++-4.1 gcc gcc-4.1 gcc-4.1-base gcc-4.2-base
+  laptop-detect libblkid1 libc6 libc6-dev libcomerr2 libdb4.2 libdb4.3
+  libdb4.4 libgcc1 libncurses5 libncursesw5 libnewt0.52 libsasl2-2 libss2
+  libssl0.9.8 libstdc++6 libstdc++6-4.1-dev libtasn1-3 libuuid1 linux-libc-dev
+  mktemp mount ncurses-base ncurses-bin procps sed tar traceroute util-linux
+  whiptail
+48 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Need to get 29.8MB of archives.
+After unpacking 1061kB of additional disk space will be used.
+Get:1 http://cdn.debian.or.jp sid/main linux-libc-dev 2.6.22-3 [699kB]
+Get:2 http://cdn.debian.or.jp sid/main libc6-dev 2.6.1-1 [2493kB]
+Get:3 http://cdn.debian.or.jp sid/main gcc-4.2-base 4.2.1-4 [212kB]
+Get:4 http://cdn.debian.or.jp sid/main libgcc1 1:4.2.1-4 [26.7kB]
+Get:5 http://cdn.debian.or.jp sid/main libstdc++6 4.2.1-4 [313kB]
+Get:6 http://cdn.debian.or.jp sid/main libc6 2.6.1-1 [4912kB]
+Get:7 http://cdn.debian.or.jp sid/main e2fslibs 1.40.2-1 [113kB]
+Get:8 http://cdn.debian.or.jp sid/main e2fsprogs 1.40.2-1 [621kB]
+Get:9 http://cdn.debian.or.jp sid/main mktemp 1.5-4 [11.1kB]
+Get:10 http://cdn.debian.or.jp sid/main ncurses-bin 5.6+20070812-1 [160kB]
+Get:11 http://cdn.debian.or.jp sid/main sed 4.1.5-3 [254kB]
+Get:12 http://cdn.debian.or.jp sid/main tar 1.18-1 [790kB]
+Get:13 http://cdn.debian.or.jp sid/main base-passwd 3.5.12 [38.0kB]
+Get:14 http://cdn.debian.or.jp sid/main bsdutils 1:2.13~rc3-5 [58.2kB]
+Get:15 http://cdn.debian.or.jp sid/main libvolume-id0 0.114-2 [70.4kB]
+Get:16 http://cdn.debian.or.jp sid/main mount 2.13~rc3-5 [136kB]
+Get:17 http://cdn.debian.or.jp sid/main libncurses5 5.6+20070812-1 [330kB]
+Get:18 http://cdn.debian.or.jp sid/main ncurses-base 5.6+20070812-1 [13.0kB]
+Get:19 http://cdn.debian.or.jp sid/main util-linux 2.13~rc3-5 [427kB]
+Get:20 http://cdn.debian.or.jp sid/main libdb4.4 4.4.20-8.1 [487kB]
+Get:21 http://cdn.debian.or.jp sid/main apt-utils 0.7.6 [196kB]
+Get:22 http://cdn.debian.or.jp sid/main libncursesw5 5.6+20070812-1 [352kB]
+Get:23 http://cdn.debian.or.jp sid/main aptitude 0.4.6.1-1 [3000kB]
+Get:24 http://cdn.debian.or.jp sid/main apt 0.7.6 [1469kB]
+Get:25 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.20-2 [52.1kB]
+Get:26 http://cdn.debian.or.jp sid/main libblkid1 1.40.2-1 [47.0kB]
+Get:27 http://cdn.debian.or.jp sid/main libcomerr2 1.40.2-1 [34.1kB]
 Get:28 http://cdn.debian.or.jp sid/main libss2 1.40.2-1 [40.2kB]
 Get:29 http://cdn.debian.or.jp sid/main libuuid1 1.40.2-1 [35.0kB]
-Get:30 http://cdn.debian.or.jp sid/main sysv-rc 2.86.ds1-38.1 [56.2kB]
-Get:31 http://cdn.debian.or.jp sid/main cpio 2.9-2 [192kB]
-Get:32 http://cdn.debian.or.jp sid/main dhcp3-client 3.0.6-1 [231kB]
-Get:33 http://cdn.debian.or.jp sid/main dhcp3-common 3.0.6-1 [293kB]
-Get:34 http://cdn.debian.or.jp sid/main iptables 1.3.8.0debian1-1 [455kB]
-Get:35 http://cdn.debian.or.jp sid/main sysklogd 1.5-1 [62.6kB]
-Get:36 http://cdn.debian.or.jp sid/main klogd 1.5-1 [43.9kB]
-Get:37 http://cdn.debian.or.jp sid/main laptop-detect 0.13.2 [4764B]
-Get:38 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
-Get:39 http://cdn.debian.or.jp sid/main libdb4.2 4.2.52+dfsg-2.1 [414kB]
-Get:40 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-13 [108kB]
-Get:41 http://cdn.debian.or.jp sid/main libwrap0 7.6.dbs-14 [30.8kB]
-Get:42 http://cdn.debian.or.jp sid/main manpages 2.62-1 [516kB]
-Get:43 http://cdn.debian.or.jp sid/main nano 2.0.6-2 [572kB]
-Get:44 http://cdn.debian.or.jp sid/main netbase 4.30 [18.0kB]
-Get:45 http://cdn.debian.or.jp sid/main tcpd 7.6.dbs-14 [77.5kB]
-Get:46 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-14 [1154kB]
-Get:47 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-14 [2824kB]
-Get:48 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-14 [426kB]
-Get:49 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-14 [2516kB]
-Get:50 http://cdn.debian.or.jp sid/main gcc-4.1-base 4.1.2-14 [203kB]
-Get:51 http://cdn.debian.or.jp sid/main libattr1 1:2.4.32-1.2 [10.3kB]
-Get:52 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-3 [11.9kB]
-Get:53 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-3 [5058B]
-Get:54 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-3 [1374B]
-
Extracting templates from packages: 55%
Extracting templates from packages: 100%
+Get:30 http://cdn.debian.or.jp sid/main cpio 2.9-3 [192kB]
+Get:31 http://cdn.debian.or.jp sid/main ed 0.7-1 [51.6kB]
+Get:32 http://cdn.debian.or.jp sid/main laptop-detect 0.13.2 [4764B]
+Get:33 http://cdn.debian.or.jp sid/main libdb4.2 4.2.52+dfsg-2.1 [414kB]
+Get:34 http://cdn.debian.or.jp sid/main libnewt0.52 0.52.2-11 [70.9kB]
+Get:35 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-14 [108kB]
+Get:36 http://cdn.debian.or.jp sid/main libssl0.9.8 0.9.8e-6 [922kB]
+Get:37 http://cdn.debian.or.jp sid/main libtasn1-3 0.3.10-1 [58.3kB]
+Get:38 http://cdn.debian.or.jp sid/main traceroute 2.0.7-4 [45.2kB]
+Get:39 http://cdn.debian.or.jp sid/main whiptail 0.52.2-11 [35.3kB]
+Get:40 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-15 [1154kB]
+Get:41 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-15 [2827kB]
+Get:42 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-15 [427kB]
+Get:43 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-15 [2518kB]
+Get:44 http://cdn.debian.or.jp sid/main binutils 2.18~cvs20070812-1 [2683kB]
+Get:45 http://cdn.debian.or.jp sid/main gcc-4.1-base 4.1.2-15 [204kB]
+Get:46 http://cdn.debian.or.jp sid/main libdb4.3 4.3.29-8.1 [444kB]
+Get:47 http://cdn.debian.or.jp sid/main procps 1:3.2.7-4 [232kB]
+Get:48 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-3 [11.9kB]
+Get:49 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-3 [5058B]
+Get:50 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-3 [1374B]
+
Extracting templates from packages: 60%
Extracting templates from packages: 100%
 Preconfiguring packages ...
 Fetched XXXB in Xs (XXXXXB/s)
-(Reading database ... 11040 files and directories currently installed.)
-Removing libsasl2 ...
-(Reading database ... 11036 files and directories currently installed.)
-Preparing to replace bsdutils 1:2.12r-19 (using .../bsdutils_1%3a2.13~rc2-4_amd64.deb) ...
-Unpacking replacement bsdutils ...
-Setting up bsdutils (1:2.13~rc2-4) ...
-
-(Reading database ... 11036 files and directories currently installed.)
+(Reading database ... 11041 files and directories currently installed.)
 Preparing to replace linux-libc-dev 2.6.21-6 (using .../linux-libc-dev_2.6.22-3_amd64.deb) ...
 Unpacking replacement linux-libc-dev ...
-Preparing to replace libc6-dev 2.6-2 (using .../libc6-dev_2.6-5_amd64.deb) ...
+Preparing to replace libc6-dev 2.6-2 (using .../libc6-dev_2.6.1-1_amd64.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace gcc-4.2-base 4.2-20070712-1 (using .../gcc-4.2-base_4.2.1-1_amd64.deb) ...
+Preparing to replace gcc-4.2-base 4.2-20070712-1 (using .../gcc-4.2-base_4.2.1-4_amd64.deb) ...
 Unpacking replacement gcc-4.2-base ...
-Preparing to replace libgcc1 1:4.2-20070712-1 (using .../libgcc1_1%3a4.2.1-1_amd64.deb) ...
+Preparing to replace libgcc1 1:4.2-20070712-1 (using .../libgcc1_1%3a4.2.1-4_amd64.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up gcc-4.2-base (4.2.1-1) ...
+Setting up gcc-4.2-base (4.2.1-4) ...
 
-Setting up libgcc1 (1:4.2.1-1) ...
+Setting up libgcc1 (1:4.2.1-4) ...
 
-(Reading database ... 11039 files and directories currently installed.)
-Preparing to replace libstdc++6 4.2-20070712-1 (using .../libstdc++6_4.2.1-1_amd64.deb) ...
+(Reading database ... 11044 files and directories currently installed.)
+Preparing to replace libstdc++6 4.2-20070712-1 (using .../libstdc++6_4.2.1-4_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.2.1-1) ...
+Setting up libstdc++6 (4.2.1-4) ...
 
-(Reading database ... 11039 files and directories currently installed.)
-Preparing to replace libc6 2.6-2 (using .../archives/libc6_2.6-5_amd64.deb) ...
+(Reading database ... 11044 files and directories currently installed.)
+Preparing to replace libc6 2.6-2 (using .../libc6_2.6.1-1_amd64.deb) ...
 Unpacking replacement libc6 ...
-Setting up libc6 (2.6-5) ...
+Setting up libc6 (2.6.1-1) ...
 Installing new version of config file /etc/init.d/glibc.sh ...
 
-(Reading database ... 11040 files and directories currently installed.)
+(Reading database ... 11046 files and directories currently installed.)
 Preparing to replace e2fslibs 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../e2fslibs_1.40.2-1_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.40.2-1) ...
 
-(Reading database ... 11040 files and directories currently installed.)
+(Reading database ... 11046 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../e2fsprogs_1.40.2-1_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Setting up e2fsprogs (1.40.2-1) ...
-Selecting previously deselected package libvolume-id0.
-(Reading database ... 11040 files and directories currently installed.)
-Unpacking libvolume-id0 (from .../libvolume-id0_0.113-3_amd64.deb) ...
-Setting up libvolume-id0 (0.113-3) ...
+(Reading database ... 11046 files and directories currently installed.)
+Preparing to replace mktemp 1.5-3 (using .../mktemp_1.5-4_amd64.deb) ...
+Unpacking replacement mktemp ...
+Setting up mktemp (1.5-4) ...
+(Reading database ... 11046 files and directories currently installed.)
+Preparing to replace ncurses-bin 5.6+20070716-1 (using .../ncurses-bin_5.6+20070812-1_amd64.deb) ...
+Unpacking replacement ncurses-bin ...
+Setting up ncurses-bin (5.6+20070812-1) ...
+(Reading database ... 11046 files and directories currently installed.)
+Preparing to replace sed 4.1.5-2 (using .../archives/sed_4.1.5-3_amd64.deb) ...
+Unpacking replacement sed ...
+Setting up sed (4.1.5-3) ...
 
 (Reading database ... 11046 files and directories currently installed.)
-Preparing to replace mount 2.12r-19 (using .../mount_2.13~rc2-4_amd64.deb) ...
+Preparing to replace tar 1.16.1-1 (using .../archives/tar_1.18-1_amd64.deb) ...
+Unpacking replacement tar ...
+Setting up tar (1.18-1) ...
+
+(Reading database ... 11049 files and directories currently installed.)
+Preparing to replace base-passwd 3.5.11 (using .../base-passwd_3.5.12_amd64.deb) ...
+Unpacking replacement base-passwd ...
+Setting up base-passwd (3.5.12) ...
+
+(Reading database ... 11049 files and directories currently installed.)
+Preparing to replace bsdutils 1:2.12r-19 (using .../bsdutils_1%3a2.13~rc3-5_amd64.deb) ...
+Unpacking replacement bsdutils ...
+Setting up bsdutils (1:2.13~rc3-5) ...
+
+Selecting previously deselected package libvolume-id0.
+(Reading database ... 11049 files and directories currently installed.)
+Unpacking libvolume-id0 (from .../libvolume-id0_0.114-2_amd64.deb) ...
+Setting up libvolume-id0 (0.114-2) ...
+
+(Reading database ... 11055 files and directories currently installed.)
+Preparing to replace mount 2.12r-19 (using .../mount_2.13~rc3-5_amd64.deb) ...
 Unpacking replacement mount ...
-Setting up mount (2.13~rc2-4) ...
-
-(Reading database ... 11045 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-38 (using .../sysvinit_2.86.ds1-38.1_amd64.deb) ...
-Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-38.1) ...
-init: timeout opening/writing control channel /dev/initctl
-
-(Reading database ... 11045 files and directories currently installed.)
-Preparing to replace lsb-base 3.1-23.1 (using .../lsb-base_3.1-24_all.deb) ...
-Unpacking replacement lsb-base ...
-Setting up lsb-base (3.1-24) ...
-(Reading database ... 11045 files and directories currently installed.)
-Preparing to replace debconf-i18n 1.5.13 (using .../debconf-i18n_1.5.14_all.deb) ...
-Unpacking replacement debconf-i18n ...
-Preparing to replace debconf 1.5.13 (using .../debconf_1.5.14_all.deb) ...
-Unpacking replacement debconf ...
-Preparing to replace tzdata 2007f-9 (using .../tzdata_2007f-10_all.deb) ...
-Unpacking replacement tzdata ...
-Setting up debconf-i18n (1.5.14) ...
-Setting up debconf (1.5.14) ...
-Installing new version of config file /etc/bash_completion.d/debconf ...
-
-Setting up tzdata (2007f-10) ...
-
-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 ... 11051 files and directories currently installed.)
-Preparing to replace util-linux 2.12r-19 (using .../util-linux_2.13~rc2-4_amd64.deb) ...
+Setting up mount (2.13~rc3-5) ...
+
+(Reading database ... 11054 files and directories currently installed.)
+Preparing to replace libncurses5 5.6+20070716-1 (using .../libncurses5_5.6+20070812-1_amd64.deb) ...
+Unpacking replacement libncurses5 ...
+Setting up libncurses5 (5.6+20070812-1) ...
+
+(Reading database ... 11054 files and directories currently installed.)
+Preparing to replace ncurses-base 5.6+20070716-1 (using .../ncurses-base_5.6+20070812-1_all.deb) ...
+Unpacking replacement ncurses-base ...
+Setting up ncurses-base (5.6+20070812-1) ...
+(Reading database ... 11054 files and directories currently installed.)
+Preparing to replace util-linux 2.12r-19 (using .../util-linux_2.13~rc3-5_amd64.deb) ...
 Unpacking replacement util-linux ...
-Setting up util-linux (2.13~rc2-4) ...
+Setting up util-linux (2.13~rc3-5) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 
-(Reading database ... 11064 files and directories currently installed.)
-Preparing to replace sysvinit-utils 2.86.ds1-38 (using .../sysvinit-utils_2.86.ds1-38.1_amd64.deb) ...
-Unpacking replacement sysvinit-utils ...
-Setting up sysvinit-utils (2.86.ds1-38.1) ...
-(Reading database ... 11064 files and directories currently installed.)
-Preparing to replace apt-utils 0.7.3 (using .../apt-utils_0.7.4_amd64.deb) ...
+(Reading database ... 11067 files and directories currently installed.)
+Preparing to replace libdb4.4 4.4.20-8 (using .../libdb4.4_4.4.20-8.1_amd64.deb) ...
+Unpacking replacement libdb4.4 ...
+Preparing to replace apt-utils 0.7.3 (using .../apt-utils_0.7.6_amd64.deb) ...
 Unpacking replacement apt-utils ...
+Preparing to replace libncursesw5 5.6+20070716-1 (using .../libncursesw5_5.6+20070812-1_amd64.deb) ...
+Unpacking replacement libncursesw5 ...
 Preparing to replace aptitude 0.4.5.4-1 (using .../aptitude_0.4.6.1-1_amd64.deb) ...
 Unpacking replacement aptitude ...
-Preparing to replace debian-archive-keyring 2007.02.19-0.1 (using .../debian-archive-keyring_2007.07.31_all.deb) ...
-Unpacking replacement debian-archive-keyring ...
-Setting up debian-archive-keyring (2007.07.31) ...
-gpg: key 2D230C5F: "Debian Archive Automatic Signing Key (2006) <ftpmaster@debian.org>" not changed
-gpg: key 6070D3A1: "Debian Archive Automatic Signing Key (4.0/etch) <ftpmaster@debian.org>" not changed
-gpg: key ADB11277: "Etch Stable Release Key <debian-release@lists.debian.org>" not changed
-gpg: key BBE55AB3: public key "Debian-Volatile Archive Automatic Signing Key (4.0/etch)" imported
-gpg: Total number processed: 4
-gpg:               imported: 1
-gpg:              unchanged: 3
-gpg: no ultimately trusted keys found
-
-(Reading database ... 11068 files and directories currently installed.)
-Preparing to replace apt 0.7.3 (using .../archives/apt_0.7.4_amd64.deb) ...
+Preparing to replace apt 0.7.3 (using .../archives/apt_0.7.6_amd64.deb) ...
 Unpacking replacement apt ...
-Setting up apt (0.7.4) ...
+Setting up apt (0.7.6) ...
 gpg: key 2D230C5F: "Debian Archive Automatic Signing Key (2006) <ftpmaster@debian.org>" not changed
 gpg: key 6070D3A1: "Debian Archive Automatic Signing Key (4.0/etch) <ftpmaster@debian.org>" not changed
 gpg: key ADB11277: "Etch Stable Release Key <debian-release@lists.debian.org>" not changed
@@ -207,14 +189,8 @@ gpg: key BBE55AB3: "Debian-Volatile Archive Automatic Signing Key (4.0/etch)" no
 gpg: Total number processed: 4
 gpg:              unchanged: 4
 
-(Reading database ... 11068 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-38 (using .../initscripts_2.86.ds1-38.1_amd64.deb) ...
-Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-38.1) ...
-Installing new version of config file /etc/network/if-up.d/mountnfs ...
-
 Selecting previously deselected package libdevmapper1.02.1.
-(Reading database ... 11068 files and directories currently installed.)
+(Reading database ... 11072 files and directories currently installed.)
 Unpacking libdevmapper1.02.1 (from .../libdevmapper1.02.1_2%3a1.02.20-2_amd64.deb) ...
 Preparing to replace libblkid1 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libblkid1_1.40.2-1_amd64.deb) ...
 Unpacking replacement libblkid1 ...
@@ -222,73 +198,58 @@ Setting up libdevmapper1.02.1 (2:1.02.20-2) ...
 
 Setting up libblkid1 (1.40.2-1) ...
 
-(Reading database ... 11074 files and directories currently installed.)
+(Reading database ... 11078 files and directories currently installed.)
 Preparing to replace libcomerr2 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libcomerr2_1.40.2-1_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.40.2-1) ...
 
-(Reading database ... 11074 files and directories currently installed.)
-Preparing to replace libslang2 2.0.7-1 (using .../libslang2_2.0.7-3_amd64.deb) ...
-Unpacking replacement libslang2 ...
-Setting up libslang2 (2.0.7-3) ...
-
-(Reading database ... 11074 files and directories currently installed.)
+(Reading database ... 11078 files and directories currently installed.)
 Preparing to replace libss2 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libss2_1.40.2-1_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.40.2-1) ...
 
-(Reading database ... 11074 files and directories currently installed.)
+(Reading database ... 11078 files and directories currently installed.)
 Preparing to replace libuuid1 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libuuid1_1.40.2-1_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.40.2-1) ...
 
-(Reading database ... 11074 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-38 (using .../sysv-rc_2.86.ds1-38.1_all.deb) ...
-Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-38.1) ...
-(Reading database ... 11074 files and directories currently installed.)
-Preparing to replace cpio 2.7-3 (using .../archives/cpio_2.9-2_amd64.deb) ...
+(Reading database ... 11078 files and directories currently installed.)
+Preparing to replace cpio 2.7-3 (using .../archives/cpio_2.9-3_amd64.deb) ...
 Unpacking replacement cpio ...
-Preparing to replace dhcp3-client 3.0.5-3 (using .../dhcp3-client_3.0.6-1_amd64.deb) ...
-Unpacking replacement dhcp3-client ...
-Preparing to replace dhcp3-common 3.0.5-3 (using .../dhcp3-common_3.0.6-1_amd64.deb) ...
-Unpacking replacement dhcp3-common ...
-Preparing to replace iptables 1.3.6.0debian1-5 (using .../iptables_1.3.8.0debian1-1_amd64.deb) ...
-Unpacking replacement iptables ...
-Preparing to replace sysklogd 1.4.1-20 (using .../sysklogd_1.5-1_amd64.deb) ...
-Unpacking replacement sysklogd ...
-Preparing to replace klogd 1.4.1-20 (using .../archives/klogd_1.5-1_amd64.deb) ...
-Unpacking replacement klogd ...
+Preparing to replace ed 0.2-20 (using .../archives/ed_0.7-1_amd64.deb) ...
+Unpacking replacement ed ...
 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 libbz2-1.0 1.0.3-6 (using .../libbz2-1.0_1.0.3-7_amd64.deb) ...
-Unpacking replacement libbz2-1.0 ...
 Preparing to replace libdb4.2 4.2.52+dfsg-2 (using .../libdb4.2_4.2.52+dfsg-2.1_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
-Preparing to replace libsasl2-2 2.1.22.dfsg1-8 (using .../libsasl2-2_2.1.22.dfsg1-13_amd64.deb) ...
+Preparing to replace libnewt0.52 0.52.2-10 (using .../libnewt0.52_0.52.2-11_amd64.deb) ...
+Unpacking replacement libnewt0.52 ...
+Preparing to replace libsasl2-2 2.1.22.dfsg1-13 (using .../libsasl2-2_2.1.22.dfsg1-14_amd64.deb) ...
 Unpacking replacement libsasl2-2 ...
-Preparing to replace libwrap0 7.6.dbs-13 (using .../libwrap0_7.6.dbs-14_amd64.deb) ...
-Unpacking replacement libwrap0 ...
-Preparing to replace manpages 2.57-1 (using .../manpages_2.62-1_all.deb) ...
-Unpacking replacement manpages ...
-Preparing to replace nano 2.0.3-1 (using .../nano_2.0.6-2_amd64.deb) ...
-Unpacking replacement nano ...
-Preparing to replace netbase 4.29 (using .../archives/netbase_4.30_all.deb) ...
-Unpacking replacement netbase ...
-Preparing to replace tcpd 7.6.dbs-13 (using .../tcpd_7.6.dbs-14_amd64.deb) ...
-Unpacking replacement tcpd ...
-Preparing to replace libstdc++6-4.1-dev 4.1.2-13 (using .../libstdc++6-4.1-dev_4.1.2-14_amd64.deb) ...
+Preparing to replace libssl0.9.8 0.9.8e-5+b1 (using .../libssl0.9.8_0.9.8e-6_amd64.deb) ...
+Unpacking replacement libssl0.9.8 ...
+Preparing to replace libtasn1-3 0.3.9-1 (using .../libtasn1-3_0.3.10-1_amd64.deb) ...
+Unpacking replacement libtasn1-3 ...
+Preparing to replace traceroute 1.4a12-21 (using .../traceroute_2.0.7-4_amd64.deb) ...
+Unpacking replacement traceroute ...
+Preparing to replace whiptail 0.52.2-10 (using .../whiptail_0.52.2-11_amd64.deb) ...
+Unpacking replacement whiptail ...
+Preparing to replace libstdc++6-4.1-dev 4.1.2-13 (using .../libstdc++6-4.1-dev_4.1.2-15_amd64.deb) ...
 Unpacking replacement libstdc++6-4.1-dev ...
-Preparing to replace g++-4.1 4.1.2-13 (using .../g++-4.1_4.1.2-14_amd64.deb) ...
+Preparing to replace g++-4.1 4.1.2-13 (using .../g++-4.1_4.1.2-15_amd64.deb) ...
 Unpacking replacement g++-4.1 ...
-Preparing to replace gcc-4.1 4.1.2-13 (using .../gcc-4.1_4.1.2-14_amd64.deb) ...
+Preparing to replace gcc-4.1 4.1.2-13 (using .../gcc-4.1_4.1.2-15_amd64.deb) ...
 Unpacking replacement gcc-4.1 ...
-Preparing to replace cpp-4.1 4.1.2-13 (using .../cpp-4.1_4.1.2-14_amd64.deb) ...
+Preparing to replace cpp-4.1 4.1.2-13 (using .../cpp-4.1_4.1.2-15_amd64.deb) ...
 Unpacking replacement cpp-4.1 ...
-Preparing to replace gcc-4.1-base 4.1.2-13 (using .../gcc-4.1-base_4.1.2-14_amd64.deb) ...
+Preparing to replace binutils 2.17cvs20070804-1 (using .../binutils_2.18~cvs20070812-1_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace gcc-4.1-base 4.1.2-13 (using .../gcc-4.1-base_4.1.2-15_amd64.deb) ...
 Unpacking replacement gcc-4.1-base ...
-Preparing to replace libattr1 1:2.4.32-1.1 (using .../libattr1_1%3a2.4.32-1.2_amd64.deb) ...
-Unpacking replacement libattr1 ...
+Preparing to replace libdb4.3 4.3.29-8 (using .../libdb4.3_4.3.29-8.1_amd64.deb) ...
+Unpacking replacement libdb4.3 ...
+Preparing to replace procps 1:3.2.7-3 (using .../procps_1%3a3.2.7-4_amd64.deb) ...
+Unpacking replacement procps ...
 Preparing to replace cpp 4:4.1.1-15 (using .../cpp_4%3a4.1.2-3_amd64.deb) ...
 Unpacking replacement cpp ...
 Preparing to replace gcc 4:4.1.1-15 (using .../gcc_4%3a4.1.2-3_amd64.deb) ...
@@ -297,55 +258,47 @@ Unpacking replacement gcc ...
 Preparing to replace g++ 4:4.1.1-15 (using .../g++_4%3a4.1.2-3_amd64.deb) ...
 Unpacking replacement g++ ...
 Setting up linux-libc-dev (2.6.22-3) ...
-Setting up libc6-dev (2.6-5) ...
-Setting up apt-utils (0.7.4) ...
+Setting up libc6-dev (2.6.1-1) ...
+Setting up libdb4.4 (4.4.20-8.1) ...
+Setting up apt-utils (0.7.6) ...
 
-Setting up aptitude (0.4.6.1-1) ...
+Setting up libncursesw5 (5.6+20070812-1) ...
 
-Setting up cpio (2.9-2) ...
+Setting up aptitude (0.4.6.1-1) ...
 
-Setting up dhcp3-common (3.0.6-1) ...
-Setting up dhcp3-client (3.0.6-1) ...
+Setting up cpio (2.9-3) ...
 
-Setting up iptables (1.3.8.0debian1-1) ...
+Setting up ed (0.7-1) ...
 
 Setting up laptop-detect (0.13.2) ...
-Setting up libbz2-1.0 (1.0.3-7) ...
-
 Setting up libdb4.2 (4.2.52+dfsg-2.1) ...
-Setting up libsasl2-2 (2.1.22.dfsg1-13) ...
+Setting up libnewt0.52 (0.52.2-11) ...
 
-Setting up libwrap0 (7.6.dbs-14) ...
+Setting up libsasl2-2 (2.1.22.dfsg1-14) ...
 
-Setting up manpages (2.62-1) ...
-Setting up nano (2.0.6-2) ...
+Setting up libssl0.9.8 (0.9.8e-6) ...
 
-Setting up netbase (4.30) ...
-Installing new version of config file /etc/protocols ...
+Setting up libtasn1-3 (0.3.10-1) ...
 
-Setting up tcpd (7.6.dbs-14) ...
+Setting up traceroute (2.0.7-4) ...
 
-Setting up gcc-4.1-base (4.1.2-14) ...
+Setting up whiptail (0.52.2-11) ...
+Setting up gcc-4.1-base (4.1.2-15) ...
 
-Setting up cpp-4.1 (4.1.2-14) ...
-Setting up gcc-4.1 (4.1.2-14) ...
-Setting up libattr1 (1:2.4.32-1.2) ...
+Setting up cpp-4.1 (4.1.2-15) ...
+Setting up binutils (2.18~cvs20070812-1) ...
+
+Setting up gcc-4.1 (4.1.2-15) ...
+Setting up libdb4.3 (4.3.29-8.1) ...
+Setting up procps (1:3.2.7-4) ...
+Installing new version of config file /etc/sysctl.conf ...
 
 Setting up cpp (4:4.1.2-3) ...
 
 Setting up gcc (4:4.1.2-3) ...
 
-Setting up klogd (1.5-1) ...
-Installing new version of config file /etc/init.d/klogd ...
-
-Setting up sysklogd (1.5-1) ...
-Installing new version of config file /etc/syslog.conf ...
-Installing new version of config file /etc/init.d/sysklogd ...
-Installing new version of config file /etc/cron.daily/sysklogd ...
-Installing new version of config file /etc/cron.weekly/sysklogd ...
-
-Setting up g++-4.1 (4.1.2-14) ...
-Setting up libstdc++6-4.1-dev (4.1.2-14) ...
+Setting up libstdc++6-4.1-dev (4.1.2-15) ...
+Setting up g++-4.1 (4.1.2-15) ...
 Setting up g++ (4:4.1.2-3) ...
 
 Reading package lists...
diff --git a/testsuite/normal/pbuilder-update-lenny-sid-experimental.log b/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
index 5028af9..aaedc8f 100644
--- a/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
@@ -15,7 +15,7 @@ Get:2 http://cdn.debian.or.jp experimental Release.gpg [189B]
 Hit http://cdn.debian.or.jp sid Release
 Get:3 http://cdn.debian.or.jp experimental Release [79.6kB]
 Get:4 http://cdn.debian.or.jp sid/main Packages/DiffIndex [2038B]
-Get:5 http://cdn.debian.or.jp experimental/main Packages [244kB]
+Get:5 http://cdn.debian.or.jp experimental/main Packages [274kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -25,25 +25,29 @@ Reading state information...
 The following NEW packages will be installed:
   cpp-4.2 g++-4.2 gcc-4.2 iproute libatm1 libgomp1 libstdc++6-4.2-dev
 The following packages will be upgraded:
-  cpp findutils g++ gcc ifupdown libgcrypt11 libgnutls13 wget
-8 upgraded, 7 newly installed, 0 to remove and 0 not upgraded.
-Need to get 9833kB of archives.
-After unpacking 25.5MB of additional disk space will be used.
+  cpp findutils g++ gcc ifupdown libgcrypt11 libgnutls13 libpam-modules
+  libpam-runtime libpam0g wget
+11 upgraded, 7 newly installed, 0 to remove and 0 not upgraded.
+Need to get 10.3MB of archives.
+After unpacking 26.1MB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp experimental/main findutils 4.3.8-1 [631kB]
-Get:2 http://cdn.debian.or.jp sid/main libatm1 2.4.1-17.1 [69.8kB]
-Get:3 http://cdn.debian.or.jp sid/main iproute 20070313-1 [360kB]
-Get:4 http://cdn.debian.or.jp experimental/main ifupdown 0.7~alpha2 [53.0kB]
-Get:5 http://cdn.debian.or.jp experimental/main libgcrypt11 1.3.0-1 [233kB]
-Get:6 http://cdn.debian.or.jp experimental/main libgnutls13 1.7.14-1 [393kB]
-Get:7 http://cdn.debian.or.jp experimental/main wget 1.10.2+1.11.beta1-1 [635kB]
-Get:8 http://cdn.debian.or.jp sid/main cpp-4.2 4.2.1-1 [2704kB]
-Get:9 http://cdn.debian.or.jp experimental/main cpp 4:4.2.0-1 [12.0kB]
-Get:10 http://cdn.debian.or.jp sid/main libgomp1 4.2.1-1 [13.4kB]
-Get:11 http://cdn.debian.or.jp sid/main gcc-4.2 4.2.1-1 [484kB]
-Get:12 http://cdn.debian.or.jp experimental/main gcc 4:4.2.0-1 [5066B]
-Get:13 http://cdn.debian.or.jp sid/main libstdc++6-4.2-dev 4.2.1-1 [1213kB]
-Get:14 http://cdn.debian.or.jp sid/main g++-4.2 4.2.1-1 [3024kB]
-Get:15 http://cdn.debian.or.jp experimental/main g++ 4:4.2.0-1 [1376B]
+Get:2 http://cdn.debian.or.jp experimental/main libpam-runtime 0.99.7.1-1 [95.1kB]
+Get:3 http://cdn.debian.or.jp experimental/main libpam0g 0.99.7.1-1 [74.0kB]
+Get:4 http://cdn.debian.or.jp experimental/main libpam-modules 0.99.7.1-1 [260kB]
+Get:5 http://cdn.debian.or.jp sid/main libatm1 2.4.1-17.1 [69.8kB]
+Get:6 http://cdn.debian.or.jp sid/main iproute 20070313-1 [360kB]
+Get:7 http://cdn.debian.or.jp experimental/main ifupdown 0.7~alpha2 [53.0kB]
+Get:8 http://cdn.debian.or.jp experimental/main libgcrypt11 1.3.0-1 [233kB]
+Get:9 http://cdn.debian.or.jp experimental/main libgnutls13 1.7.16-1 [396kB]
+Get:10 http://cdn.debian.or.jp experimental/main wget 1.10.2+1.11.beta1-1 [635kB]
+Get:11 http://cdn.debian.or.jp sid/main cpp-4.2 4.2.1-4 [2706kB]
+Get:12 http://cdn.debian.or.jp experimental/main cpp 4:4.2.0-1 [12.0kB]
+Get:13 http://cdn.debian.or.jp sid/main libgomp1 4.2.1-4 [13.4kB]
+Get:14 http://cdn.debian.or.jp sid/main gcc-4.2 4.2.1-4 [485kB]
+Get:15 http://cdn.debian.or.jp experimental/main gcc 4:4.2.0-1 [5066B]
+Get:16 http://cdn.debian.or.jp sid/main libstdc++6-4.2-dev 4.2.1-4 [1213kB]
+Get:17 http://cdn.debian.or.jp sid/main g++-4.2 4.2.1-4 [3025kB]
+Get:18 http://cdn.debian.or.jp experimental/main g++ 4:4.2.0-1 [1376B]
 Preconfiguring packages ...
 Fetched XXXB in Xs (XXXXXB/s)
 (Reading database ... 11103 files and directories currently installed.)
@@ -51,8 +55,27 @@ Preparing to replace findutils 4.2.31-1 (using .../findutils_4.3.8-1_amd64.deb)
 Unpacking replacement findutils ...
 Setting up findutils (4.3.8-1) ...
 
-Selecting previously deselected package libatm1.
 (Reading database ... 11105 files and directories currently installed.)
+Preparing to replace libpam-runtime 0.79-4 (using .../libpam-runtime_0.99.7.1-1_all.deb) ...
+Unpacking replacement libpam-runtime ...
+Setting up libpam-runtime (0.99.7.1-1) ...
+
+(Reading database ... 11127 files and directories currently installed.)
+Preparing to replace libpam0g 0.79-4 (using .../libpam0g_0.99.7.1-1_amd64.deb) ...
+Unpacking replacement libpam0g ...
+Setting up libpam0g (0.99.7.1-1) ...
+
+(Reading database ... 11127 files and directories currently installed.)
+Preparing to replace libpam-modules 0.79-4 (using .../libpam-modules_0.99.7.1-1_amd64.deb) ...
+Unpacking replacement libpam-modules ...
+Setting up libpam-modules (0.99.7.1-1) ...
+Installing new version of config file /etc/security/access.conf ...
+Installing new version of config file /etc/security/group.conf ...
+Installing new version of config file /etc/security/limits.conf ...
+Installing new version of config file /etc/security/pam_env.conf ...
+Installing new version of config file /etc/security/time.conf ...
+Selecting previously deselected package libatm1.
+(Reading database ... 11182 files and directories currently installed.)
 Unpacking libatm1 (from .../libatm1_2.4.1-17.1_amd64.deb) ...
 Selecting previously deselected package iproute.
 Unpacking iproute (from .../iproute_20070313-1_amd64.deb) ...
@@ -60,25 +83,25 @@ Preparing to replace ifupdown 0.6.8 (using .../ifupdown_0.7~alpha2_amd64.deb) ..
 Unpacking replacement ifupdown ...
 Preparing to replace libgcrypt11 1.2.4-2 (using .../libgcrypt11_1.3.0-1_amd64.deb) ...
 Unpacking replacement libgcrypt11 ...
-Preparing to replace libgnutls13 1.6.3-1 (using .../libgnutls13_1.7.14-1_amd64.deb) ...
+Preparing to replace libgnutls13 1.6.3-1 (using .../libgnutls13_1.7.16-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
 Preparing to replace wget 1.10.2-3 (using .../wget_1.10.2+1.11.beta1-1_amd64.deb) ...
 Unpacking replacement wget ...
 Selecting previously deselected package cpp-4.2.
-Unpacking cpp-4.2 (from .../cpp-4.2_4.2.1-1_amd64.deb) ...
+Unpacking cpp-4.2 (from .../cpp-4.2_4.2.1-4_amd64.deb) ...
 Preparing to replace cpp 4:4.1.2-3 (using .../cpp_4%3a4.2.0-1_amd64.deb) ...
 Unpacking replacement cpp ...
 Selecting previously deselected package libgomp1.
-Unpacking libgomp1 (from .../libgomp1_4.2.1-1_amd64.deb) ...
+Unpacking libgomp1 (from .../libgomp1_4.2.1-4_amd64.deb) ...
 Selecting previously deselected package gcc-4.2.
-Unpacking gcc-4.2 (from .../gcc-4.2_4.2.1-1_amd64.deb) ...
+Unpacking gcc-4.2 (from .../gcc-4.2_4.2.1-4_amd64.deb) ...
 Preparing to replace gcc 4:4.1.2-3 (using .../gcc_4%3a4.2.0-1_amd64.deb) ...
 Removing old gcc doc directory.
 Unpacking replacement gcc ...
 Selecting previously deselected package libstdc++6-4.2-dev.
-Unpacking libstdc++6-4.2-dev (from .../libstdc++6-4.2-dev_4.2.1-1_amd64.deb) ...
+Unpacking libstdc++6-4.2-dev (from .../libstdc++6-4.2-dev_4.2.1-4_amd64.deb) ...
 Selecting previously deselected package g++-4.2.
-Unpacking g++-4.2 (from .../g++-4.2_4.2.1-1_amd64.deb) ...
+Unpacking g++-4.2 (from .../g++-4.2_4.2.1-4_amd64.deb) ...
 Preparing to replace g++ 4:4.1.2-3 (using .../g++_4%3a4.2.0-1_amd64.deb) ...
 Unpacking replacement g++ ...
 Setting up libatm1 (2.4.1-17.1) ...
@@ -90,20 +113,20 @@ ifupdown.postinst: Warning: No 'auto lo' statement found in /etc/network/interfa
 
 Setting up libgcrypt11 (1.3.0-1) ...
 
-Setting up libgnutls13 (1.7.14-1) ...
+Setting up libgnutls13 (1.7.16-1) ...
 
 Setting up wget (1.10.2+1.11.beta1-1) ...
 
-Setting up cpp-4.2 (4.2.1-1) ...
+Setting up cpp-4.2 (4.2.1-4) ...
 Setting up cpp (4:4.2.0-1) ...
 
-Setting up libgomp1 (4.2.1-1) ...
+Setting up libgomp1 (4.2.1-4) ...
 
-Setting up gcc-4.2 (4.2.1-1) ...
+Setting up gcc-4.2 (4.2.1-4) ...
 Setting up gcc (4:4.2.0-1) ...
 
-Setting up g++-4.2 (4.2.1-1) ...
-Setting up libstdc++6-4.2-dev (4.2.1-1) ...
+Setting up g++-4.2 (4.2.1-4) ...
+Setting up libstdc++6-4.2-dev (4.2.1-4) ...
 Setting up g++ (4:4.2.0-1) ...
 
 Reading package lists...
diff --git a/testsuite/normal/pbuilder-update-lenny-sid.log b/testsuite/normal/pbuilder-update-lenny-sid.log
index 1d83a8e..4449378 100644
--- a/testsuite/normal/pbuilder-update-lenny-sid.log
+++ b/testsuite/normal/pbuilder-update-lenny-sid.log
@@ -11,195 +11,177 @@ 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 [6278kB]
+Get:3 http://cdn.debian.or.jp sid/main Packages [6291kB]
 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...
 Reading state information...
-The following packages will be REMOVED:
-  libsasl2
 The following NEW packages will be installed:
   libdevmapper1.02.1 libvolume-id0
 The following packages will be upgraded:
-  apt apt-utils aptitude bsdutils cpio cpp cpp-4.1 debconf debconf-i18n
-  debian-archive-keyring dhcp3-client dhcp3-common e2fslibs e2fsprogs g++
-  g++-4.1 gcc gcc-4.1 gcc-4.1-base gcc-4.2-base initscripts iptables klogd
-  laptop-detect libattr1 libblkid1 libbz2-1.0 libc6 libc6-dev libcomerr2
-  libdb4.2 libgcc1 libsasl2-2 libslang2 libss2 libstdc++6 libstdc++6-4.1-dev
-  libuuid1 libwrap0 linux-libc-dev lsb-base manpages mount nano netbase
-  sysklogd sysv-rc sysvinit sysvinit-utils tcpd tzdata util-linux
-52 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
-Need to get 26.8MB of archives.
-After unpacking 1126kB of additional disk space will be used.
-Get:1 http://cdn.debian.or.jp sid/main bsdutils 1:2.13~rc2-4 [54.9kB]
-Get:2 http://cdn.debian.or.jp sid/main linux-libc-dev 2.6.22-3 [699kB]
-Get:3 http://cdn.debian.or.jp sid/main libc6-dev 2.6-5 [2485kB]
-Get:4 http://cdn.debian.or.jp sid/main gcc-4.2-base 4.2.1-1 [211kB]
-Get:5 http://cdn.debian.or.jp sid/main libgcc1 1:4.2.1-1 [26.7kB]
-Get:6 http://cdn.debian.or.jp sid/main libstdc++6 4.2.1-1 [313kB]
-Get:7 http://cdn.debian.or.jp sid/main libc6 2.6-5 [4768kB]
-Get:8 http://cdn.debian.or.jp sid/main e2fslibs 1.40.2-1 [113kB]
-Get:9 http://cdn.debian.or.jp sid/main e2fsprogs 1.40.2-1 [621kB]
-Get:10 http://cdn.debian.or.jp sid/main libvolume-id0 0.113-3 [69.9kB]
-Get:11 http://cdn.debian.or.jp sid/main mount 2.13~rc2-4 [133kB]
-Get:12 http://cdn.debian.or.jp sid/main sysvinit 2.86.ds1-38.1 [112kB]
-Get:13 http://cdn.debian.or.jp sid/main lsb-base 3.1-24 [16.9kB]
-Get:14 http://cdn.debian.or.jp sid/main debconf-i18n 1.5.14 [160kB]
-Get:15 http://cdn.debian.or.jp sid/main debconf 1.5.14 [150kB]
-Get:16 http://cdn.debian.or.jp sid/main tzdata 2007f-10 [729kB]
-Get:17 http://cdn.debian.or.jp sid/main util-linux 2.13~rc2-4 [424kB]
-Get:18 http://cdn.debian.or.jp sid/main sysvinit-utils 2.86.ds1-38.1 [67.5kB]
-Get:19 http://cdn.debian.or.jp sid/main apt-utils 0.7.4 [195kB]
-Get:20 http://cdn.debian.or.jp sid/main aptitude 0.4.6.1-1 [3000kB]
-Get:21 http://cdn.debian.or.jp sid/main debian-archive-keyring 2007.07.31 [9292B]
-Get:22 http://cdn.debian.or.jp sid/main apt 0.7.4 [1467kB]
-Get:23 http://cdn.debian.or.jp sid/main initscripts 2.86.ds1-38.1 [60.1kB]
-Get:24 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.20-2 [52.1kB]
-Get:25 http://cdn.debian.or.jp sid/main libblkid1 1.40.2-1 [47.0kB]
-Get:26 http://cdn.debian.or.jp sid/main libcomerr2 1.40.2-1 [34.1kB]
-Get:27 http://cdn.debian.or.jp sid/main libslang2 2.0.7-3 [457kB]
+  apt apt-utils aptitude base-passwd binutils bsdutils cpio cpp cpp-4.1
+  e2fslibs e2fsprogs ed g++ g++-4.1 gcc gcc-4.1 gcc-4.1-base gcc-4.2-base
+  laptop-detect libblkid1 libc6 libc6-dev libcomerr2 libdb4.2 libdb4.3
+  libdb4.4 libgcc1 libncurses5 libncursesw5 libnewt0.52 libsasl2-2 libss2
+  libssl0.9.8 libstdc++6 libstdc++6-4.1-dev libtasn1-3 libuuid1 linux-libc-dev
+  mktemp mount ncurses-base ncurses-bin procps sed tar traceroute util-linux
+  whiptail
+48 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Need to get 29.8MB of archives.
+After unpacking 1061kB of additional disk space will be used.
+Get:1 http://cdn.debian.or.jp sid/main linux-libc-dev 2.6.22-3 [699kB]
+Get:2 http://cdn.debian.or.jp sid/main libc6-dev 2.6.1-1 [2493kB]
+Get:3 http://cdn.debian.or.jp sid/main gcc-4.2-base 4.2.1-4 [212kB]
+Get:4 http://cdn.debian.or.jp sid/main libgcc1 1:4.2.1-4 [26.7kB]
+Get:5 http://cdn.debian.or.jp sid/main libstdc++6 4.2.1-4 [313kB]
+Get:6 http://cdn.debian.or.jp sid/main libc6 2.6.1-1 [4912kB]
+Get:7 http://cdn.debian.or.jp sid/main e2fslibs 1.40.2-1 [113kB]
+Get:8 http://cdn.debian.or.jp sid/main e2fsprogs 1.40.2-1 [621kB]
+Get:9 http://cdn.debian.or.jp sid/main mktemp 1.5-4 [11.1kB]
+Get:10 http://cdn.debian.or.jp sid/main ncurses-bin 5.6+20070812-1 [160kB]
+Get:11 http://cdn.debian.or.jp sid/main sed 4.1.5-3 [254kB]
+Get:12 http://cdn.debian.or.jp sid/main tar 1.18-1 [790kB]
+Get:13 http://cdn.debian.or.jp sid/main base-passwd 3.5.12 [38.0kB]
+Get:14 http://cdn.debian.or.jp sid/main bsdutils 1:2.13~rc3-5 [58.2kB]
+Get:15 http://cdn.debian.or.jp sid/main libvolume-id0 0.114-2 [70.4kB]
+Get:16 http://cdn.debian.or.jp sid/main mount 2.13~rc3-5 [136kB]
+Get:17 http://cdn.debian.or.jp sid/main libncurses5 5.6+20070812-1 [330kB]
+Get:18 http://cdn.debian.or.jp sid/main ncurses-base 5.6+20070812-1 [13.0kB]
+Get:19 http://cdn.debian.or.jp sid/main util-linux 2.13~rc3-5 [427kB]
+Get:20 http://cdn.debian.or.jp sid/main libdb4.4 4.4.20-8.1 [487kB]
+Get:21 http://cdn.debian.or.jp sid/main apt-utils 0.7.6 [196kB]
+Get:22 http://cdn.debian.or.jp sid/main libncursesw5 5.6+20070812-1 [352kB]
+Get:23 http://cdn.debian.or.jp sid/main aptitude 0.4.6.1-1 [3000kB]
+Get:24 http://cdn.debian.or.jp sid/main apt 0.7.6 [1469kB]
+Get:25 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.20-2 [52.1kB]
+Get:26 http://cdn.debian.or.jp sid/main libblkid1 1.40.2-1 [47.0kB]
+Get:27 http://cdn.debian.or.jp sid/main libcomerr2 1.40.2-1 [34.1kB]
 Get:28 http://cdn.debian.or.jp sid/main libss2 1.40.2-1 [40.2kB]
 Get:29 http://cdn.debian.or.jp sid/main libuuid1 1.40.2-1 [35.0kB]
-Get:30 http://cdn.debian.or.jp sid/main sysv-rc 2.86.ds1-38.1 [56.2kB]
-Get:31 http://cdn.debian.or.jp sid/main cpio 2.9-2 [192kB]
-Get:32 http://cdn.debian.or.jp sid/main dhcp3-client 3.0.6-1 [231kB]
-Get:33 http://cdn.debian.or.jp sid/main dhcp3-common 3.0.6-1 [293kB]
-Get:34 http://cdn.debian.or.jp sid/main iptables 1.3.8.0debian1-1 [455kB]
-Get:35 http://cdn.debian.or.jp sid/main sysklogd 1.5-1 [62.6kB]
-Get:36 http://cdn.debian.or.jp sid/main klogd 1.5-1 [43.9kB]
-Get:37 http://cdn.debian.or.jp sid/main laptop-detect 0.13.2 [4764B]
-Get:38 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
-Get:39 http://cdn.debian.or.jp sid/main libdb4.2 4.2.52+dfsg-2.1 [414kB]
-Get:40 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-13 [108kB]
-Get:41 http://cdn.debian.or.jp sid/main libwrap0 7.6.dbs-14 [30.8kB]
-Get:42 http://cdn.debian.or.jp sid/main manpages 2.62-1 [516kB]
-Get:43 http://cdn.debian.or.jp sid/main nano 2.0.6-2 [572kB]
-Get:44 http://cdn.debian.or.jp sid/main netbase 4.30 [18.0kB]
-Get:45 http://cdn.debian.or.jp sid/main tcpd 7.6.dbs-14 [77.5kB]
-Get:46 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-14 [1154kB]
-Get:47 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-14 [2824kB]
-Get:48 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-14 [426kB]
-Get:49 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-14 [2516kB]
-Get:50 http://cdn.debian.or.jp sid/main gcc-4.1-base 4.1.2-14 [203kB]
-Get:51 http://cdn.debian.or.jp sid/main libattr1 1:2.4.32-1.2 [10.3kB]
-Get:52 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-3 [11.9kB]
-Get:53 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-3 [5058B]
-Get:54 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-3 [1374B]
-
Extracting templates from packages: 55%
Extracting templates from packages: 100%
+Get:30 http://cdn.debian.or.jp sid/main cpio 2.9-3 [192kB]
+Get:31 http://cdn.debian.or.jp sid/main ed 0.7-1 [51.6kB]
+Get:32 http://cdn.debian.or.jp sid/main laptop-detect 0.13.2 [4764B]
+Get:33 http://cdn.debian.or.jp sid/main libdb4.2 4.2.52+dfsg-2.1 [414kB]
+Get:34 http://cdn.debian.or.jp sid/main libnewt0.52 0.52.2-11 [70.9kB]
+Get:35 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-14 [108kB]
+Get:36 http://cdn.debian.or.jp sid/main libssl0.9.8 0.9.8e-6 [922kB]
+Get:37 http://cdn.debian.or.jp sid/main libtasn1-3 0.3.10-1 [58.3kB]
+Get:38 http://cdn.debian.or.jp sid/main traceroute 2.0.7-4 [45.2kB]
+Get:39 http://cdn.debian.or.jp sid/main whiptail 0.52.2-11 [35.3kB]
+Get:40 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-15 [1154kB]
+Get:41 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-15 [2827kB]
+Get:42 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-15 [427kB]
+Get:43 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-15 [2518kB]
+Get:44 http://cdn.debian.or.jp sid/main binutils 2.18~cvs20070812-1 [2683kB]
+Get:45 http://cdn.debian.or.jp sid/main gcc-4.1-base 4.1.2-15 [204kB]
+Get:46 http://cdn.debian.or.jp sid/main libdb4.3 4.3.29-8.1 [444kB]
+Get:47 http://cdn.debian.or.jp sid/main procps 1:3.2.7-4 [232kB]
+Get:48 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-3 [11.9kB]
+Get:49 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-3 [5058B]
+Get:50 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-3 [1374B]
+
Extracting templates from packages: 60%
Extracting templates from packages: 100%
 Preconfiguring packages ...
 Fetched XXXB in Xs (XXXXXB/s)
-(Reading database ... 11050 files and directories currently installed.)
-Removing libsasl2 ...
-(Reading database ... 11046 files and directories currently installed.)
-Preparing to replace bsdutils 1:2.12r-19 (using .../bsdutils_1%3a2.13~rc2-4_amd64.deb) ...
-Unpacking replacement bsdutils ...
-Setting up bsdutils (1:2.13~rc2-4) ...
-
-(Reading database ... 11046 files and directories currently installed.)
+(Reading database ... 11043 files and directories currently installed.)
 Preparing to replace linux-libc-dev 2.6.21-6 (using .../linux-libc-dev_2.6.22-3_amd64.deb) ...
 Unpacking replacement linux-libc-dev ...
-Preparing to replace libc6-dev 2.6-2 (using .../libc6-dev_2.6-5_amd64.deb) ...
+Preparing to replace libc6-dev 2.6-2 (using .../libc6-dev_2.6.1-1_amd64.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace gcc-4.2-base 4.2-20070712-1 (using .../gcc-4.2-base_4.2.1-1_amd64.deb) ...
+Preparing to replace gcc-4.2-base 4.2-20070712-1 (using .../gcc-4.2-base_4.2.1-4_amd64.deb) ...
 Unpacking replacement gcc-4.2-base ...
-Preparing to replace libgcc1 1:4.2-20070712-1 (using .../libgcc1_1%3a4.2.1-1_amd64.deb) ...
+Preparing to replace libgcc1 1:4.2-20070712-1 (using .../libgcc1_1%3a4.2.1-4_amd64.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up gcc-4.2-base (4.2.1-1) ...
+Setting up gcc-4.2-base (4.2.1-4) ...
 
-Setting up libgcc1 (1:4.2.1-1) ...
+Setting up libgcc1 (1:4.2.1-4) ...
 
-(Reading database ... 11049 files and directories currently installed.)
-Preparing to replace libstdc++6 4.2-20070712-1 (using .../libstdc++6_4.2.1-1_amd64.deb) ...
+(Reading database ... 11046 files and directories currently installed.)
+Preparing to replace libstdc++6 4.2-20070712-1 (using .../libstdc++6_4.2.1-4_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.2.1-1) ...
+Setting up libstdc++6 (4.2.1-4) ...
 
-(Reading database ... 11049 files and directories currently installed.)
-Preparing to replace libc6 2.6-2 (using .../archives/libc6_2.6-5_amd64.deb) ...
+(Reading database ... 11046 files and directories currently installed.)
+Preparing to replace libc6 2.6-2 (using .../libc6_2.6.1-1_amd64.deb) ...
 Unpacking replacement libc6 ...
-Setting up libc6 (2.6-5) ...
+Setting up libc6 (2.6.1-1) ...
 Installing new version of config file /etc/init.d/glibc.sh ...
 
-(Reading database ... 11050 files and directories currently installed.)
+(Reading database ... 11048 files and directories currently installed.)
 Preparing to replace e2fslibs 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../e2fslibs_1.40.2-1_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.40.2-1) ...
 
-(Reading database ... 11050 files and directories currently installed.)
+(Reading database ... 11048 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../e2fsprogs_1.40.2-1_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Setting up e2fsprogs (1.40.2-1) ...
+(Reading database ... 11048 files and directories currently installed.)
+Preparing to replace mktemp 1.5-3 (using .../mktemp_1.5-4_amd64.deb) ...
+Unpacking replacement mktemp ...
+Setting up mktemp (1.5-4) ...
+(Reading database ... 11048 files and directories currently installed.)
+Preparing to replace ncurses-bin 5.6+20070716-1 (using .../ncurses-bin_5.6+20070812-1_amd64.deb) ...
+Unpacking replacement ncurses-bin ...
+Setting up ncurses-bin (5.6+20070812-1) ...
+(Reading database ... 11048 files and directories currently installed.)
+Preparing to replace sed 4.1.5-2 (using .../archives/sed_4.1.5-3_amd64.deb) ...
+Unpacking replacement sed ...
+Setting up sed (4.1.5-3) ...
+
+(Reading database ... 11048 files and directories currently installed.)
+Preparing to replace tar 1.16.1-1 (using .../archives/tar_1.18-1_amd64.deb) ...
+Unpacking replacement tar ...
+Setting up tar (1.18-1) ...
+
+(Reading database ... 11051 files and directories currently installed.)
+Preparing to replace base-passwd 3.5.11 (using .../base-passwd_3.5.12_amd64.deb) ...
+Unpacking replacement base-passwd ...
+Setting up base-passwd (3.5.12) ...
+
+(Reading database ... 11051 files and directories currently installed.)
+Preparing to replace bsdutils 1:2.12r-19 (using .../bsdutils_1%3a2.13~rc3-5_amd64.deb) ...
+Unpacking replacement bsdutils ...
+Setting up bsdutils (1:2.13~rc3-5) ...
+
 Selecting previously deselected package libvolume-id0.
-(Reading database ... 11050 files and directories currently installed.)
-Unpacking libvolume-id0 (from .../libvolume-id0_0.113-3_amd64.deb) ...
-Setting up libvolume-id0 (0.113-3) ...
+(Reading database ... 11051 files and directories currently installed.)
+Unpacking libvolume-id0 (from .../libvolume-id0_0.114-2_amd64.deb) ...
+Setting up libvolume-id0 (0.114-2) ...
 
-(Reading database ... 11056 files and directories currently installed.)
-Preparing to replace mount 2.12r-19 (using .../mount_2.13~rc2-4_amd64.deb) ...
+(Reading database ... 11057 files and directories currently installed.)
+Preparing to replace mount 2.12r-19 (using .../mount_2.13~rc3-5_amd64.deb) ...
 Unpacking replacement mount ...
-Setting up mount (2.13~rc2-4) ...
-
-(Reading database ... 11055 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-38 (using .../sysvinit_2.86.ds1-38.1_amd64.deb) ...
-Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-38.1) ...
-init: timeout opening/writing control channel /dev/initctl
-
-(Reading database ... 11055 files and directories currently installed.)
-Preparing to replace lsb-base 3.1-23.1 (using .../lsb-base_3.1-24_all.deb) ...
-Unpacking replacement lsb-base ...
-Setting up lsb-base (3.1-24) ...
-(Reading database ... 11055 files and directories currently installed.)
-Preparing to replace debconf-i18n 1.5.13 (using .../debconf-i18n_1.5.14_all.deb) ...
-Unpacking replacement debconf-i18n ...
-Preparing to replace debconf 1.5.13 (using .../debconf_1.5.14_all.deb) ...
-Unpacking replacement debconf ...
-Preparing to replace tzdata 2007f-9 (using .../tzdata_2007f-10_all.deb) ...
-Unpacking replacement tzdata ...
-Setting up debconf-i18n (1.5.14) ...
-Setting up debconf (1.5.14) ...
-Installing new version of config file /etc/bash_completion.d/debconf ...
-
-Setting up tzdata (2007f-10) ...
-
-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 ... 11061 files and directories currently installed.)
-Preparing to replace util-linux 2.12r-19 (using .../util-linux_2.13~rc2-4_amd64.deb) ...
+Setting up mount (2.13~rc3-5) ...
+
+(Reading database ... 11056 files and directories currently installed.)
+Preparing to replace libncurses5 5.6+20070716-1 (using .../libncurses5_5.6+20070812-1_amd64.deb) ...
+Unpacking replacement libncurses5 ...
+Setting up libncurses5 (5.6+20070812-1) ...
+
+(Reading database ... 11056 files and directories currently installed.)
+Preparing to replace ncurses-base 5.6+20070716-1 (using .../ncurses-base_5.6+20070812-1_all.deb) ...
+Unpacking replacement ncurses-base ...
+Setting up ncurses-base (5.6+20070812-1) ...
+(Reading database ... 11056 files and directories currently installed.)
+Preparing to replace util-linux 2.12r-19 (using .../util-linux_2.13~rc3-5_amd64.deb) ...
 Unpacking replacement util-linux ...
-Setting up util-linux (2.13~rc2-4) ...
+Setting up util-linux (2.13~rc3-5) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 
-(Reading database ... 11074 files and directories currently installed.)
-Preparing to replace sysvinit-utils 2.86.ds1-38 (using .../sysvinit-utils_2.86.ds1-38.1_amd64.deb) ...
-Unpacking replacement sysvinit-utils ...
-Setting up sysvinit-utils (2.86.ds1-38.1) ...
-(Reading database ... 11074 files and directories currently installed.)
-Preparing to replace apt-utils 0.7.3 (using .../apt-utils_0.7.4_amd64.deb) ...
+(Reading database ... 11069 files and directories currently installed.)
+Preparing to replace libdb4.4 4.4.20-8 (using .../libdb4.4_4.4.20-8.1_amd64.deb) ...
+Unpacking replacement libdb4.4 ...
+Preparing to replace apt-utils 0.7.3 (using .../apt-utils_0.7.6_amd64.deb) ...
 Unpacking replacement apt-utils ...
+Preparing to replace libncursesw5 5.6+20070716-1 (using .../libncursesw5_5.6+20070812-1_amd64.deb) ...
+Unpacking replacement libncursesw5 ...
 Preparing to replace aptitude 0.4.5.4-1 (using .../aptitude_0.4.6.1-1_amd64.deb) ...
 Unpacking replacement aptitude ...
-Preparing to replace debian-archive-keyring 2007.02.19-0.1 (using .../debian-archive-keyring_2007.07.31_all.deb) ...
-Unpacking replacement debian-archive-keyring ...
-Setting up debian-archive-keyring (2007.07.31) ...
-gpg: key 2D230C5F: "Debian Archive Automatic Signing Key (2006) <ftpmaster@debian.org>" not changed
-gpg: key 6070D3A1: "Debian Archive Automatic Signing Key (4.0/etch) <ftpmaster@debian.org>" not changed
-gpg: key ADB11277: "Etch Stable Release Key <debian-release@lists.debian.org>" not changed
-gpg: key BBE55AB3: public key "Debian-Volatile Archive Automatic Signing Key (4.0/etch)" imported
-gpg: Total number processed: 4
-gpg:               imported: 1
-gpg:              unchanged: 3
-gpg: no ultimately trusted keys found
-
-(Reading database ... 11078 files and directories currently installed.)
-Preparing to replace apt 0.7.3 (using .../archives/apt_0.7.4_amd64.deb) ...
+Preparing to replace apt 0.7.3 (using .../archives/apt_0.7.6_amd64.deb) ...
 Unpacking replacement apt ...
-Setting up apt (0.7.4) ...
+Setting up apt (0.7.6) ...
 gpg: key 2D230C5F: "Debian Archive Automatic Signing Key (2006) <ftpmaster@debian.org>" not changed
 gpg: key 6070D3A1: "Debian Archive Automatic Signing Key (4.0/etch) <ftpmaster@debian.org>" not changed
 gpg: key ADB11277: "Etch Stable Release Key <debian-release@lists.debian.org>" not changed
@@ -207,14 +189,8 @@ gpg: key BBE55AB3: "Debian-Volatile Archive Automatic Signing Key (4.0/etch)" no
 gpg: Total number processed: 4
 gpg:              unchanged: 4
 
-(Reading database ... 11078 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-38 (using .../initscripts_2.86.ds1-38.1_amd64.deb) ...
-Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-38.1) ...
-Installing new version of config file /etc/network/if-up.d/mountnfs ...
-
 Selecting previously deselected package libdevmapper1.02.1.
-(Reading database ... 11078 files and directories currently installed.)
+(Reading database ... 11074 files and directories currently installed.)
 Unpacking libdevmapper1.02.1 (from .../libdevmapper1.02.1_2%3a1.02.20-2_amd64.deb) ...
 Preparing to replace libblkid1 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libblkid1_1.40.2-1_amd64.deb) ...
 Unpacking replacement libblkid1 ...
@@ -222,73 +198,58 @@ Setting up libdevmapper1.02.1 (2:1.02.20-2) ...
 
 Setting up libblkid1 (1.40.2-1) ...
 
-(Reading database ... 11084 files and directories currently installed.)
+(Reading database ... 11080 files and directories currently installed.)
 Preparing to replace libcomerr2 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libcomerr2_1.40.2-1_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.40.2-1) ...
 
-(Reading database ... 11084 files and directories currently installed.)
-Preparing to replace libslang2 2.0.7-1 (using .../libslang2_2.0.7-3_amd64.deb) ...
-Unpacking replacement libslang2 ...
-Setting up libslang2 (2.0.7-3) ...
-
-(Reading database ... 11084 files and directories currently installed.)
+(Reading database ... 11080 files and directories currently installed.)
 Preparing to replace libss2 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libss2_1.40.2-1_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.40.2-1) ...
 
-(Reading database ... 11084 files and directories currently installed.)
+(Reading database ... 11080 files and directories currently installed.)
 Preparing to replace libuuid1 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libuuid1_1.40.2-1_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.40.2-1) ...
 
-(Reading database ... 11084 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-38 (using .../sysv-rc_2.86.ds1-38.1_all.deb) ...
-Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-38.1) ...
-(Reading database ... 11084 files and directories currently installed.)
-Preparing to replace cpio 2.7-3 (using .../archives/cpio_2.9-2_amd64.deb) ...
+(Reading database ... 11080 files and directories currently installed.)
+Preparing to replace cpio 2.7-3 (using .../archives/cpio_2.9-3_amd64.deb) ...
 Unpacking replacement cpio ...
-Preparing to replace dhcp3-client 3.0.5-3 (using .../dhcp3-client_3.0.6-1_amd64.deb) ...
-Unpacking replacement dhcp3-client ...
-Preparing to replace dhcp3-common 3.0.5-3 (using .../dhcp3-common_3.0.6-1_amd64.deb) ...
-Unpacking replacement dhcp3-common ...
-Preparing to replace iptables 1.3.6.0debian1-5 (using .../iptables_1.3.8.0debian1-1_amd64.deb) ...
-Unpacking replacement iptables ...
-Preparing to replace sysklogd 1.4.1-20 (using .../sysklogd_1.5-1_amd64.deb) ...
-Unpacking replacement sysklogd ...
-Preparing to replace klogd 1.4.1-20 (using .../archives/klogd_1.5-1_amd64.deb) ...
-Unpacking replacement klogd ...
+Preparing to replace ed 0.2-20 (using .../archives/ed_0.7-1_amd64.deb) ...
+Unpacking replacement ed ...
 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 libbz2-1.0 1.0.3-6 (using .../libbz2-1.0_1.0.3-7_amd64.deb) ...
-Unpacking replacement libbz2-1.0 ...
 Preparing to replace libdb4.2 4.2.52+dfsg-2 (using .../libdb4.2_4.2.52+dfsg-2.1_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
-Preparing to replace libsasl2-2 2.1.22.dfsg1-8 (using .../libsasl2-2_2.1.22.dfsg1-13_amd64.deb) ...
+Preparing to replace libnewt0.52 0.52.2-10 (using .../libnewt0.52_0.52.2-11_amd64.deb) ...
+Unpacking replacement libnewt0.52 ...
+Preparing to replace libsasl2-2 2.1.22.dfsg1-13 (using .../libsasl2-2_2.1.22.dfsg1-14_amd64.deb) ...
 Unpacking replacement libsasl2-2 ...
-Preparing to replace libwrap0 7.6.dbs-13 (using .../libwrap0_7.6.dbs-14_amd64.deb) ...
-Unpacking replacement libwrap0 ...
-Preparing to replace manpages 2.57-1 (using .../manpages_2.62-1_all.deb) ...
-Unpacking replacement manpages ...
-Preparing to replace nano 2.0.3-1 (using .../nano_2.0.6-2_amd64.deb) ...
-Unpacking replacement nano ...
-Preparing to replace netbase 4.29 (using .../archives/netbase_4.30_all.deb) ...
-Unpacking replacement netbase ...
-Preparing to replace tcpd 7.6.dbs-13 (using .../tcpd_7.6.dbs-14_amd64.deb) ...
-Unpacking replacement tcpd ...
-Preparing to replace libstdc++6-4.1-dev 4.1.2-13 (using .../libstdc++6-4.1-dev_4.1.2-14_amd64.deb) ...
+Preparing to replace libssl0.9.8 0.9.8e-5+b1 (using .../libssl0.9.8_0.9.8e-6_amd64.deb) ...
+Unpacking replacement libssl0.9.8 ...
+Preparing to replace libtasn1-3 0.3.9-1 (using .../libtasn1-3_0.3.10-1_amd64.deb) ...
+Unpacking replacement libtasn1-3 ...
+Preparing to replace traceroute 1.4a12-21 (using .../traceroute_2.0.7-4_amd64.deb) ...
+Unpacking replacement traceroute ...
+Preparing to replace whiptail 0.52.2-10 (using .../whiptail_0.52.2-11_amd64.deb) ...
+Unpacking replacement whiptail ...
+Preparing to replace libstdc++6-4.1-dev 4.1.2-13 (using .../libstdc++6-4.1-dev_4.1.2-15_amd64.deb) ...
 Unpacking replacement libstdc++6-4.1-dev ...
-Preparing to replace g++-4.1 4.1.2-13 (using .../g++-4.1_4.1.2-14_amd64.deb) ...
+Preparing to replace g++-4.1 4.1.2-13 (using .../g++-4.1_4.1.2-15_amd64.deb) ...
 Unpacking replacement g++-4.1 ...
-Preparing to replace gcc-4.1 4.1.2-13 (using .../gcc-4.1_4.1.2-14_amd64.deb) ...
+Preparing to replace gcc-4.1 4.1.2-13 (using .../gcc-4.1_4.1.2-15_amd64.deb) ...
 Unpacking replacement gcc-4.1 ...
-Preparing to replace cpp-4.1 4.1.2-13 (using .../cpp-4.1_4.1.2-14_amd64.deb) ...
+Preparing to replace cpp-4.1 4.1.2-13 (using .../cpp-4.1_4.1.2-15_amd64.deb) ...
 Unpacking replacement cpp-4.1 ...
-Preparing to replace gcc-4.1-base 4.1.2-13 (using .../gcc-4.1-base_4.1.2-14_amd64.deb) ...
+Preparing to replace binutils 2.17cvs20070804-1 (using .../binutils_2.18~cvs20070812-1_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace gcc-4.1-base 4.1.2-13 (using .../gcc-4.1-base_4.1.2-15_amd64.deb) ...
 Unpacking replacement gcc-4.1-base ...
-Preparing to replace libattr1 1:2.4.32-1.1 (using .../libattr1_1%3a2.4.32-1.2_amd64.deb) ...
-Unpacking replacement libattr1 ...
+Preparing to replace libdb4.3 4.3.29-8 (using .../libdb4.3_4.3.29-8.1_amd64.deb) ...
+Unpacking replacement libdb4.3 ...
+Preparing to replace procps 1:3.2.7-3 (using .../procps_1%3a3.2.7-4_amd64.deb) ...
+Unpacking replacement procps ...
 Preparing to replace cpp 4:4.1.1-15 (using .../cpp_4%3a4.1.2-3_amd64.deb) ...
 Unpacking replacement cpp ...
 Preparing to replace gcc 4:4.1.1-15 (using .../gcc_4%3a4.1.2-3_amd64.deb) ...
@@ -297,55 +258,47 @@ Unpacking replacement gcc ...
 Preparing to replace g++ 4:4.1.1-15 (using .../g++_4%3a4.1.2-3_amd64.deb) ...
 Unpacking replacement g++ ...
 Setting up linux-libc-dev (2.6.22-3) ...
-Setting up libc6-dev (2.6-5) ...
-Setting up apt-utils (0.7.4) ...
+Setting up libc6-dev (2.6.1-1) ...
+Setting up libdb4.4 (4.4.20-8.1) ...
+Setting up apt-utils (0.7.6) ...
 
-Setting up aptitude (0.4.6.1-1) ...
+Setting up libncursesw5 (5.6+20070812-1) ...
 
-Setting up cpio (2.9-2) ...
+Setting up aptitude (0.4.6.1-1) ...
 
-Setting up dhcp3-common (3.0.6-1) ...
-Setting up dhcp3-client (3.0.6-1) ...
+Setting up cpio (2.9-3) ...
 
-Setting up iptables (1.3.8.0debian1-1) ...
+Setting up ed (0.7-1) ...
 
 Setting up laptop-detect (0.13.2) ...
-Setting up libbz2-1.0 (1.0.3-7) ...
-
 Setting up libdb4.2 (4.2.52+dfsg-2.1) ...
-Setting up libsasl2-2 (2.1.22.dfsg1-13) ...
+Setting up libnewt0.52 (0.52.2-11) ...
 
-Setting up libwrap0 (7.6.dbs-14) ...
+Setting up libsasl2-2 (2.1.22.dfsg1-14) ...
 
-Setting up manpages (2.62-1) ...
-Setting up nano (2.0.6-2) ...
+Setting up libssl0.9.8 (0.9.8e-6) ...
 
-Setting up netbase (4.30) ...
-Installing new version of config file /etc/protocols ...
+Setting up libtasn1-3 (0.3.10-1) ...
 
-Setting up tcpd (7.6.dbs-14) ...
+Setting up traceroute (2.0.7-4) ...
 
-Setting up gcc-4.1-base (4.1.2-14) ...
+Setting up whiptail (0.52.2-11) ...
+Setting up gcc-4.1-base (4.1.2-15) ...
 
-Setting up cpp-4.1 (4.1.2-14) ...
-Setting up gcc-4.1 (4.1.2-14) ...
-Setting up libattr1 (1:2.4.32-1.2) ...
+Setting up cpp-4.1 (4.1.2-15) ...
+Setting up binutils (2.18~cvs20070812-1) ...
+
+Setting up gcc-4.1 (4.1.2-15) ...
+Setting up libdb4.3 (4.3.29-8.1) ...
+Setting up procps (1:3.2.7-4) ...
+Installing new version of config file /etc/sysctl.conf ...
 
 Setting up cpp (4:4.1.2-3) ...
 
 Setting up gcc (4:4.1.2-3) ...
 
-Setting up klogd (1.5-1) ...
-Installing new version of config file /etc/init.d/klogd ...
-
-Setting up sysklogd (1.5-1) ...
-Installing new version of config file /etc/syslog.conf ...
-Installing new version of config file /etc/init.d/sysklogd ...
-Installing new version of config file /etc/cron.daily/sysklogd ...
-Installing new version of config file /etc/cron.weekly/sysklogd ...
-
-Setting up g++-4.1 (4.1.2-14) ...
-Setting up libstdc++6-4.1-dev (4.1.2-14) ...
+Setting up libstdc++6-4.1-dev (4.1.2-15) ...
+Setting up g++-4.1 (4.1.2-15) ...
 Setting up g++ (4:4.1.2-3) ...
 
 Reading package lists...
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index 05217ac..e34c109 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -47,24 +47,26 @@ Setting DEBBUILDOPTS=
    -> Trying debhelper
  -> Considering build-dep libdshconfig1-dev (>= 0.20.11-1)
    -> Trying libdshconfig1-dev
- -> Installing  debhelper libdshconfig1-dev
+ -> Considering build-dep po4a
+   -> Trying po4a
+ -> Installing  debhelper libdshconfig1-dev po4a
 Reading package lists...
 Building dependency tree...
 The following extra packages will be installed:
   file gettext gettext-base html2text intltool-debian libdshconfig1 libmagic1
-  po-debconf
+  libsgmls-perl libsp1c2 po-debconf sp
 Suggested packages:
-  dh-make cvs gettext-doc
+  dh-make cvs gettext-doc sgmlspl sgmls-doc doc-base sgml-data
 Recommended packages:
-  libmail-sendmail-perl libcompress-zlib-perl
+  libmail-sendmail-perl libcompress-zlib-perl libterm-readkey-perl
 The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
-  libdshconfig1-dev libmagic1 po-debconf
-0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3482kB of archives.
-After unpacking 11.9MB of additional disk space will be used.
-Get:1 http://cdn.debian.or.jp etch/main libmagic1 4.17-5etch1 [276kB]
-Get:2 http://cdn.debian.or.jp etch/main file 4.17-5etch1 [32.1kB]
+  libdshconfig1-dev libmagic1 libsgmls-perl libsp1c2 po-debconf po4a sp
+0 upgraded, 14 newly installed, 0 to remove and 0 not upgraded.
+Need to get 5775kB of archives.
+After unpacking 19.3MB of additional disk space will be used.
+Get:1 http://cdn.debian.or.jp etch/main libmagic1 4.17-5etch2 [276kB]
+Get:2 http://cdn.debian.or.jp etch/main file 4.17-5etch2 [32.2kB]
 Get:3 http://cdn.debian.or.jp etch/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://cdn.debian.or.jp etch/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://cdn.debian.or.jp etch/main gettext 0.16.1-1 [2261kB]
@@ -73,12 +75,16 @@ Get:7 http://cdn.debian.or.jp etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp etch/main debhelper 5.0.42 [510kB]
 Get:9 http://cdn.debian.or.jp etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
+Get:11 http://cdn.debian.or.jp etch/main libsgmls-perl 1.03ii-31 [29.3kB]
+Get:12 http://cdn.debian.or.jp etch/main libsp1c2 1.3.4-1.2.1-47 [1386kB]
+Get:13 http://cdn.debian.or.jp etch/main sp 1.3.4-1.2.1-47 [182kB]
+Get:14 http://cdn.debian.or.jp etch/main po4a 0.29-1 [695kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12127 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.17-5etch1_amd64.deb) ...
+Unpacking libmagic1 (from .../libmagic1_4.17-5etch2_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../file_4.17-5etch1_amd64.deb) ...
+Unpacking file (from .../file_4.17-5etch2_amd64.deb) ...
 Selecting previously deselected package gettext-base.
 Unpacking gettext-base (from .../gettext-base_0.16.1-1_amd64.deb) ...
 Selecting previously deselected package html2text.
@@ -95,9 +101,17 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
-Setting up libmagic1 (4.17-5etch1) ...
+Selecting previously deselected package libsgmls-perl.
+Unpacking libsgmls-perl (from .../libsgmls-perl_1.03ii-31_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.29-1_all.deb) ...
+Setting up libmagic1 (4.17-5etch2) ...
 
-Setting up file (4.17-5etch1) ...
+Setting up file (4.17-5etch2) ...
 Setting up gettext-base (0.16.1-1) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -110,6 +124,12 @@ Setting up debhelper (5.0.42) ...
 Setting up libdshconfig1 (0.20.12-2) ...
 
 Setting up libdshconfig1-dev (0.20.12-2) ...
+Setting up libsgmls-perl (1.03ii-31) ...
+Setting up libsp1c2 (1.3.4-1.2.1-47) ...
+
+Setting up sp (1.3.4-1.2.1-47) ...
+
+Setting up po4a (0.29-1) ...
  -> Finished parsing the build-deps
 Reading package lists...
 Building dependency tree...
@@ -121,36 +141,36 @@ After unpacking 406kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp etch/main fakeroot 1.5.10 [97.4kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12797 files and directories currently installed.)
+(Reading database ... 13053 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
 dpkg-buildpackage: source package is dsh
-dpkg-buildpackage: source version is 0.25.8-1
+dpkg-buildpackage: source version is 0.25.9-1
 dpkg-buildpackage: source changed by Junichi Uekawa <dancer@debian.org>
 dpkg-buildpackage: host architecture amd64
-dpkg-buildpackage: source version without epoch 0.25.8-1
+dpkg-buildpackage: source version without epoch 0.25.9-1
  fakeroot debian/rules clean
 dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 dh_clean
- dpkg-source -b dsh-0.25.8
-dpkg-source: building dsh using existing dsh_0.25.8.orig.tar.gz
-dpkg-source: building dsh in dsh_0.25.8-1.diff.gz
+ dpkg-source -b dsh-0.25.9
+dpkg-source: building dsh using existing dsh_0.25.9.orig.tar.gz
+dpkg-source: building dsh in dsh_0.25.9-1.diff.gz
 dpkg-source: warning: file debian/compat has no final newline (either original or modified version)
 dpkg-source: warning: file dcp.sh has no final newline (either original or modified version)
-dpkg-source: building dsh in dsh_0.25.8-1.dsc
+dpkg-source: building dsh in dsh_0.25.9-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
@@ -197,7 +217,7 @@ checking if the linker (/usr/bin/ld) is GNU ld... yes
 checking for /usr/bin/ld option to reload object files... -r
 checking for BSD-compatible nm... /usr/bin/nm -B
 checking whether ln -s works... yes
-checking how to recognise dependent libraries... pass_all
+checking how to recognize dependent libraries... pass_all
 checking for sys/types.h... yes
 checking for sys/stat.h... yes
 checking for stdlib.h... yes
@@ -242,7 +262,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... 32768
+checking the maximum length of command line arguments... 98304
 checking command to parse /usr/bin/nm -B output from gcc object... ok
 checking for objdir... .libs
 checking for ar... ar
@@ -337,18 +357,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 Making all in m4
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 Making all in po
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/po'
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -357,30 +377,30 @@ if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDL
 	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --tag=CC --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
-gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
+gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so  
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 /usr/bin/make check
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 Making check in m4
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 Making check in po
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/po'
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 /usr/bin/make  dsh
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -416,10 +436,10 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -431,7 +451,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
-Wed Aug  1 03:10:35 UTC 2007
+Fri Aug 17 03:11:58 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,14 +521,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
-Wed Aug  1 03:10:40 UTC 2007
+Fri Aug 17 03:12:03 UTC 2007
 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).
 a: a
-b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -517,9 +537,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -527,58 +547,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/TESTDIR/dir2/dsh-0.25.8/debian/dsh
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+/usr/bin/make install DESTDIR=/TESTDIR/dir2/dsh-0.25.9/debian/dsh
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 Making install in m4
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/m4'
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/m4'
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 Making install in po
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/gettext/po/$file; \
+			    /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/po'
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
-test -z "/usr/bin" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
+test -z "/usr/bin" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-cp /TESTDIR/dir2/dsh-0.25.8/debian/machines.list /TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh/machines.list
-cp /TESTDIR/dir2/dsh-0.25.8/dsh.conf /TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh/group/all
-install -d /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/lib/update-cluster
-install -m 755 /TESTDIR/dir2/dsh-0.25.8/debian/dsh.updatelist /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+cp /TESTDIR/dir2/dsh-0.25.9/debian/machines.list /TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh/machines.list
+cp /TESTDIR/dir2/dsh-0.25.9/dsh.conf /TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh/group/all
+install -d /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/lib/update-cluster
+install -m 755 /TESTDIR/dir2/dsh-0.25.9/debian/dsh.updatelist /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -595,7 +615,7 @@ dh_installdeb
 dh_gencontrol
 dh_md5sums
 dh_builddeb
-dpkg-deb: building package `dsh' in `../dsh_0.25.8-1_amd64.deb'.
+dpkg-deb: building package `dsh' in `../dsh_0.25.9-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
diff --git a/testsuite/normal/pdebuild-internal-lenny.log b/testsuite/normal/pdebuild-internal-lenny.log
index 8c36f31..583daf1 100644
--- a/testsuite/normal/pdebuild-internal-lenny.log
+++ b/testsuite/normal/pdebuild-internal-lenny.log
@@ -20,28 +20,28 @@ Recommended packages:
 The following NEW packages will be installed:
   cdebootstrap libdebian-installer-extra4 libdebian-installer4 pbuilder
 0 upgraded, 4 newly installed, 0 to remove and 0 not upgraded.
-Need to get 329kB of archives.
-After unpacking 1176kB of additional disk space will be used.
+Need to get 239kB of archives.
+After unpacking 1098kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main libdebian-installer4 0.52 [28.0kB]
 Get:2 http://cdn.debian.or.jp lenny/main libdebian-installer-extra4 0.52 [10.7kB]
 Get:3 http://cdn.debian.or.jp lenny/main cdebootstrap 0.4.3 [29.0kB]
-Get:4 http://cdn.debian.or.jp lenny/main pbuilder 0.170 [261kB]
+Get:4 http://cdn.debian.or.jp lenny/main pbuilder 0.171 [172kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11050 files and directories currently installed.)
+(Reading database ... 11043 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.52_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.52_amd64.deb) ...
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.4.3_amd64.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.170_all.deb) ...
+Unpacking pbuilder (from .../pbuilder_0.171_all.deb) ...
 Setting up libdebian-installer4 (0.52) ...
 
 Setting up libdebian-installer-extra4 (0.52) ...
 
 Setting up cdebootstrap (0.4.3) ...
-Setting up pbuilder (0.170) ...
+Setting up pbuilder (0.171) ...
 
 Setting DEBBUILDOPTS=
  -> Attempting to parse the build-deps 
@@ -49,45 +49,51 @@ Setting DEBBUILDOPTS=
    -> Trying debhelper
  -> Considering build-dep libdshconfig1-dev (>= 0.20.11-1)
    -> Trying libdshconfig1-dev
- -> Installing  debhelper libdshconfig1-dev
+ -> Considering build-dep po4a
+   -> Trying po4a
+ -> Installing  debhelper libdshconfig1-dev po4a
 Reading package lists...
 Building dependency tree...
 Reading state information...
 The following extra packages will be installed:
   file gettext gettext-base html2text intltool-debian libdshconfig1 libmagic1
-  po-debconf
+  libsgmls-perl libsp1c2 po-debconf sp
 Suggested packages:
-  dh-make cvs gettext-doc
+  dh-make cvs gettext-doc sgmlspl sgmls-doc doc-base sgml-data
 Recommended packages:
-  libmail-sendmail-perl libcompress-zlib-perl
+  libmail-sendmail-perl libcompress-zlib-perl libterm-readkey-perl
 The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
-  libdshconfig1-dev libmagic1 po-debconf
-0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3562kB of archives.
-After unpacking 12.1MB of additional disk space will be used.
+  libdshconfig1-dev libmagic1 libsgmls-perl libsp1c2 po-debconf po4a sp
+0 upgraded, 14 newly installed, 0 to remove and 0 not upgraded.
+Need to get 5888kB of archives.
+After unpacking 19.3MB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main libmagic1 4.21-2 [332kB]
 Get:2 http://cdn.debian.or.jp lenny/main file 4.21-2 [40.0kB]
-Get:3 http://cdn.debian.or.jp lenny/main gettext-base 0.16.1-1 [132kB]
+Get:3 http://cdn.debian.or.jp lenny/main gettext-base 0.16.1-2 [133kB]
 Get:4 http://cdn.debian.or.jp lenny/main html2text 1.3.2a-3 [92.7kB]
-Get:5 http://cdn.debian.or.jp lenny/main gettext 0.16.1-1 [2261kB]
+Get:5 http://cdn.debian.or.jp lenny/main gettext 0.16.1-2 [2269kB]
 Get:6 http://cdn.debian.or.jp lenny/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:7 http://cdn.debian.or.jp lenny/main po-debconf 1.0.9 [117kB]
 Get:8 http://cdn.debian.or.jp lenny/main debhelper 5.0.53 [520kB]
 Get:9 http://cdn.debian.or.jp lenny/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp lenny/main libdshconfig1-dev 0.20.12-2 [25.3kB]
+Get:11 http://cdn.debian.or.jp lenny/main libsgmls-perl 1.03ii-31 [29.3kB]
+Get:12 http://cdn.debian.or.jp lenny/main libsp1c2 1.3.4-1.2.1-47 [1386kB]
+Get:13 http://cdn.debian.or.jp lenny/main sp 1.3.4-1.2.1-47 [182kB]
+Get:14 http://cdn.debian.or.jp lenny/main po4a 0.31-1 [720kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11170 files and directories currently installed.)
+(Reading database ... 11164 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.21-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.21-2_amd64.deb) ...
 Selecting previously deselected package gettext-base.
-Unpacking gettext-base (from .../gettext-base_0.16.1-1_amd64.deb) ...
+Unpacking gettext-base (from .../gettext-base_0.16.1-2_amd64.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
-Unpacking gettext (from .../gettext_0.16.1-1_amd64.deb) ...
+Unpacking gettext (from .../gettext_0.16.1-2_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.
@@ -98,14 +104,22 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
+Selecting previously deselected package libsgmls-perl.
+Unpacking libsgmls-perl (from .../libsgmls-perl_1.03ii-31_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.31-1_all.deb) ...
 Setting up libmagic1 (4.21-2) ...
 
 Setting up file (4.21-2) ...
-Setting up gettext-base (0.16.1-1) ...
+Setting up gettext-base (0.16.1-2) ...
 
 Setting up html2text (1.3.2a-3) ...
 
-Setting up gettext (0.16.1-1) ...
+Setting up gettext (0.16.1-2) ...
 
 Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.9) ...
@@ -113,6 +127,12 @@ Setting up debhelper (5.0.53) ...
 Setting up libdshconfig1 (0.20.12-2) ...
 
 Setting up libdshconfig1-dev (0.20.12-2) ...
+Setting up libsgmls-perl (1.03ii-31) ...
+Setting up libsp1c2 (1.3.4-1.2.1-47) ...
+
+Setting up sp (1.3.4-1.2.1-47) ...
+
+Setting up po4a (0.31-1) ...
  -> Finished parsing the build-deps
 Reading package lists...
 Building dependency tree...
@@ -125,36 +145,36 @@ After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main fakeroot 1.7.1 [111kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11850 files and directories currently installed.)
+(Reading database ... 12106 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
 dpkg-buildpackage: source package is dsh
-dpkg-buildpackage: source version is 0.25.8-1
+dpkg-buildpackage: source version is 0.25.9-1
 dpkg-buildpackage: source changed by Junichi Uekawa <dancer@debian.org>
 dpkg-buildpackage: host architecture amd64
-dpkg-buildpackage: source version without epoch 0.25.8-1
+dpkg-buildpackage: source version without epoch 0.25.9-1
  fakeroot debian/rules clean
 dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 dh_clean
- dpkg-source -b dsh-0.25.8
-dpkg-source: building dsh using existing dsh_0.25.8.orig.tar.gz
-dpkg-source: building dsh in dsh_0.25.8-1.diff.gz
+ dpkg-source -b dsh-0.25.9
+dpkg-source: building dsh using existing dsh_0.25.9.orig.tar.gz
+dpkg-source: building dsh in dsh_0.25.9-1.diff.gz
 dpkg-source: warning: file debian/compat has no final newline (either original or modified version)
 dpkg-source: warning: file dcp.sh has no final newline (either original or modified version)
-dpkg-source: building dsh in dsh_0.25.8-1.dsc
+dpkg-source: building dsh in dsh_0.25.9-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
@@ -201,7 +221,7 @@ checking if the linker (/usr/bin/ld) is GNU ld... yes
 checking for /usr/bin/ld option to reload object files... -r
 checking for BSD-compatible nm... /usr/bin/nm -B
 checking whether ln -s works... yes
-checking how to recognise dependent libraries... pass_all
+checking how to recognize dependent libraries... pass_all
 checking for sys/types.h... yes
 checking for sys/stat.h... yes
 checking for stdlib.h... yes
@@ -246,7 +266,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... 32768
+checking the maximum length of command line arguments... 98304
 checking command to parse /usr/bin/nm -B output from gcc object... ok
 checking for objdir... .libs
 checking for ar... ar
@@ -341,18 +361,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 Making all in m4
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 Making all in po
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/po'
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -361,30 +381,30 @@ if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDL
 	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --tag=CC --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
-gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
+gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so  
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 /usr/bin/make check
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 Making check in m4
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 Making check in po
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/po'
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 /usr/bin/make  dsh
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -431,11 +451,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
-Wed Aug  1 03:18:21 UTC 2007
+Fri Aug 17 03:19:50 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -505,14 +525,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
-Wed Aug  1 03:18:26 UTC 2007
+Fri Aug 17 03:19:55 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
-c: c
 dsh: Process terminated (before write).
+c: c
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -521,9 +541,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -531,58 +551,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/TESTDIR/dir2/dsh-0.25.8/debian/dsh
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+/usr/bin/make install DESTDIR=/TESTDIR/dir2/dsh-0.25.9/debian/dsh
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 Making install in m4
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/m4'
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/m4'
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 Making install in po
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/gettext/po/$file; \
+			    /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/po'
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
-test -z "/usr/bin" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
+test -z "/usr/bin" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-cp /TESTDIR/dir2/dsh-0.25.8/debian/machines.list /TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh/machines.list
-cp /TESTDIR/dir2/dsh-0.25.8/dsh.conf /TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh/group/all
-install -d /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/lib/update-cluster
-install -m 755 /TESTDIR/dir2/dsh-0.25.8/debian/dsh.updatelist /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+cp /TESTDIR/dir2/dsh-0.25.9/debian/machines.list /TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh/machines.list
+cp /TESTDIR/dir2/dsh-0.25.9/dsh.conf /TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh/group/all
+install -d /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/lib/update-cluster
+install -m 755 /TESTDIR/dir2/dsh-0.25.9/debian/dsh.updatelist /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -599,7 +619,7 @@ dh_installdeb
 dh_gencontrol
 dh_md5sums
 dh_builddeb
-dpkg-deb: building package `dsh' in `../dsh_0.25.8-1_amd64.deb'.
+dpkg-deb: building package `dsh' in `../dsh_0.25.9-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index dc5c4d3..6d6abeb 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -20,28 +20,28 @@ Recommended packages:
 The following NEW packages will be installed:
   cdebootstrap libdebian-installer-extra4 libdebian-installer4 pbuilder
 0 upgraded, 4 newly installed, 0 to remove and 0 not upgraded.
-Need to get 329kB of archives.
-After unpacking 1176kB of additional disk space will be used.
+Need to get 239kB of archives.
+After unpacking 1098kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main libdebian-installer4 0.52 [28.0kB]
 Get:2 http://cdn.debian.or.jp sid/main libdebian-installer-extra4 0.52 [10.7kB]
 Get:3 http://cdn.debian.or.jp sid/main cdebootstrap 0.4.3 [29.0kB]
-Get:4 http://cdn.debian.or.jp sid/main pbuilder 0.170 [261kB]
+Get:4 http://cdn.debian.or.jp sid/main pbuilder 0.171 [172kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11089 files and directories currently installed.)
+(Reading database ... 11096 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.52_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.52_amd64.deb) ...
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.4.3_amd64.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.170_all.deb) ...
+Unpacking pbuilder (from .../pbuilder_0.171_all.deb) ...
 Setting up libdebian-installer4 (0.52) ...
 
 Setting up libdebian-installer-extra4 (0.52) ...
 
 Setting up cdebootstrap (0.4.3) ...
-Setting up pbuilder (0.170) ...
+Setting up pbuilder (0.171) ...
 
 Setting DEBBUILDOPTS=
  -> Attempting to parse the build-deps 
@@ -49,23 +49,25 @@ Setting DEBBUILDOPTS=
    -> Trying debhelper
  -> Considering build-dep libdshconfig1-dev (>= 0.20.11-1)
    -> Trying libdshconfig1-dev
- -> Installing  debhelper libdshconfig1-dev
+ -> Considering build-dep po4a
+   -> Trying po4a
+ -> Installing  debhelper libdshconfig1-dev po4a
 Reading package lists...
 Building dependency tree...
 Reading state information...
 The following extra packages will be installed:
   file gettext gettext-base html2text intltool-debian libdshconfig1 libmagic1
-  po-debconf
+  libsgmls-perl libsp1c2 po-debconf sp
 Suggested packages:
-  dh-make cvs gettext-doc
+  dh-make cvs gettext-doc sgmlspl sgmls-doc doc-base sgml-data
 Recommended packages:
-  libmail-sendmail-perl libcompress-zlib-perl
+  libmail-sendmail-perl libcompress-zlib-perl libterm-readkey-perl
 The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
-  libdshconfig1-dev libmagic1 po-debconf
-0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3571kB of archives.
-After unpacking 12.1MB of additional disk space will be used.
+  libdshconfig1-dev libmagic1 libsgmls-perl libsp1c2 po-debconf po4a sp
+0 upgraded, 14 newly installed, 0 to remove and 0 not upgraded.
+Need to get 5888kB of archives.
+After unpacking 19.3MB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.21-2 [332kB]
 Get:2 http://cdn.debian.or.jp sid/main file 4.21-2 [40.0kB]
 Get:3 http://cdn.debian.or.jp sid/main gettext-base 0.16.1-2 [133kB]
@@ -74,11 +76,15 @@ Get:5 http://cdn.debian.or.jp sid/main gettext 0.16.1-2 [2269kB]
 Get:6 http://cdn.debian.or.jp sid/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:7 http://cdn.debian.or.jp sid/main po-debconf 1.0.9 [117kB]
 Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.53 [520kB]
-Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.12-2 [10.9kB]
-Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
+Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.13-1 [11.0kB]
+Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.13-1 [25.4kB]
+Get:11 http://cdn.debian.or.jp sid/main libsgmls-perl 1.03ii-31 [29.3kB]
+Get:12 http://cdn.debian.or.jp sid/main libsp1c2 1.3.4-1.2.1-47 [1386kB]
+Get:13 http://cdn.debian.or.jp sid/main sp 1.3.4-1.2.1-47 [182kB]
+Get:14 http://cdn.debian.or.jp sid/main po4a 0.31-1 [720kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11209 files and directories currently installed.)
+(Reading database ... 11217 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.21-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.21-2_amd64.deb) ...
@@ -95,9 +101,17 @@ Unpacking po-debconf (from .../po-debconf_1.0.9_all.deb) ...
 Selecting previously deselected package debhelper.
 Unpacking debhelper (from .../debhelper_5.0.53_all.deb) ...
 Selecting previously deselected package libdshconfig1.
-Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
+Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
-Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
+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-31_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.31-1_all.deb) ...
 Setting up libmagic1 (4.21-2) ...
 
 Setting up file (4.21-2) ...
@@ -110,9 +124,15 @@ Setting up gettext (0.16.1-2) ...
 Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.9) ...
 Setting up debhelper (5.0.53) ...
-Setting up libdshconfig1 (0.20.12-2) ...
+Setting up libdshconfig1 (0.20.13-1) ...
 
-Setting up libdshconfig1-dev (0.20.12-2) ...
+Setting up libdshconfig1-dev (0.20.13-1) ...
+Setting up libsgmls-perl (1.03ii-31) ...
+Setting up libsp1c2 (1.3.4-1.2.1-47) ...
+
+Setting up sp (1.3.4-1.2.1-47) ...
+
+Setting up po4a (0.31-1) ...
  -> Finished parsing the build-deps
 Reading package lists...
 Building dependency tree...
@@ -125,36 +145,36 @@ After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main fakeroot 1.7.1 [111kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11890 files and directories currently installed.)
+(Reading database ... 12159 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
 dpkg-buildpackage: source package is dsh
-dpkg-buildpackage: source version is 0.25.8-1
+dpkg-buildpackage: source version is 0.25.9-1
 dpkg-buildpackage: source changed by Junichi Uekawa <dancer@debian.org>
 dpkg-buildpackage: host architecture amd64
-dpkg-buildpackage: source version without epoch 0.25.8-1
+dpkg-buildpackage: source version without epoch 0.25.9-1
  fakeroot debian/rules clean
 dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 dh_clean
- dpkg-source -b dsh-0.25.8
-dpkg-source: building dsh using existing dsh_0.25.8.orig.tar.gz
-dpkg-source: building dsh in dsh_0.25.8-1.diff.gz
+ dpkg-source -b dsh-0.25.9
+dpkg-source: building dsh using existing dsh_0.25.9.orig.tar.gz
+dpkg-source: building dsh in dsh_0.25.9-1.diff.gz
 dpkg-source: warning: file debian/compat has no final newline (either original or modified version)
 dpkg-source: warning: file dcp.sh has no final newline (either original or modified version)
-dpkg-source: building dsh in dsh_0.25.8-1.dsc
+dpkg-source: building dsh in dsh_0.25.9-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
@@ -201,7 +221,7 @@ checking if the linker (/usr/bin/ld) is GNU ld... yes
 checking for /usr/bin/ld option to reload object files... -r
 checking for BSD-compatible nm... /usr/bin/nm -B
 checking whether ln -s works... yes
-checking how to recognise dependent libraries... pass_all
+checking how to recognize dependent libraries... pass_all
 checking for sys/types.h... yes
 checking for sys/stat.h... yes
 checking for stdlib.h... yes
@@ -246,7 +266,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... 32768
+checking the maximum length of command line arguments... 98304
 checking command to parse /usr/bin/nm -B output from gcc object... ok
 checking for objdir... .libs
 checking for ar... ar
@@ -341,18 +361,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 Making all in m4
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 Making all in po
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/po'
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -361,30 +381,30 @@ if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDL
 	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --tag=CC --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
-gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
+gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so  
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 /usr/bin/make check
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 Making check in m4
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 Making check in po
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/po'
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 /usr/bin/make  dsh
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -421,8 +441,8 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -431,11 +451,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
-Wed Aug  1 03:05:29 UTC 2007
+Fri Aug 17 03:06:34 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -505,13 +525,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
-Wed Aug  1 03:05:34 UTC 2007
+Fri Aug 17 03:06:39 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-b: b
 a: a
+b: b
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -520,9 +541,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -530,58 +551,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/TESTDIR/dir2/dsh-0.25.8/debian/dsh
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+/usr/bin/make install DESTDIR=/TESTDIR/dir2/dsh-0.25.9/debian/dsh
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 Making install in m4
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/m4'
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/m4'
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/m4'
 Making install in po
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/gettext/po/$file; \
+			    /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8/po'
-make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
-make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
-test -z "/usr/bin" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
+test -z "/usr/bin" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
-cp /TESTDIR/dir2/dsh-0.25.8/debian/machines.list /TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh/machines.list
-cp /TESTDIR/dir2/dsh-0.25.8/dsh.conf /TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /TESTDIR/dir2/dsh-0.25.8/debian/dsh/etc/dsh/group/all
-install -d /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/lib/update-cluster
-install -m 755 /TESTDIR/dir2/dsh-0.25.8/debian/dsh.updatelist /TESTDIR/dir2/dsh-0.25.8/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
+cp /TESTDIR/dir2/dsh-0.25.9/debian/machines.list /TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh/machines.list
+cp /TESTDIR/dir2/dsh-0.25.9/dsh.conf /TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /TESTDIR/dir2/dsh-0.25.9/debian/dsh/etc/dsh/group/all
+install -d /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/lib/update-cluster
+install -m 755 /TESTDIR/dir2/dsh-0.25.9/debian/dsh.updatelist /TESTDIR/dir2/dsh-0.25.9/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -598,7 +619,7 @@ dh_installdeb
 dh_gencontrol
 dh_md5sums
 dh_builddeb
-dpkg-deb: building package `dsh' in `../dsh_0.25.8-1_amd64.deb'.
+dpkg-deb: building package `dsh' in `../dsh_0.25.9-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index 8443c32..918ea9d 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -1,28 +1,28 @@
 dpkg-buildpackage: source package is dsh
-dpkg-buildpackage: source version is 0.25.8-1
+dpkg-buildpackage: source version is 0.25.9-1
 dpkg-buildpackage: source changed by Junichi Uekawa <dancer@debian.org>
-dpkg-buildpackage: source version without epoch 0.25.8-1
+dpkg-buildpackage: source version without epoch 0.25.9-1
  fakeroot debian/rules clean
 dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 dh_clean
- dpkg-source -b dsh-0.25.8
-dpkg-source: building dsh using existing dsh_0.25.8.orig.tar.gz
-dpkg-source: building dsh in dsh_0.25.8-1.diff.gz
+ dpkg-source -b dsh-0.25.9
+dpkg-source: building dsh using existing dsh_0.25.9.orig.tar.gz
+dpkg-source: building dsh in dsh_0.25.9-1.diff.gz
 dpkg-source: warning: file debian/compat has no final newline (either original or modified version)
 dpkg-source: warning: file dcp.sh has no final newline (either original or modified version)
-dpkg-source: building dsh in dsh_0.25.8-1.dsc
+dpkg-source: building dsh in dsh_0.25.9-1.dsc
  dpkg-genchanges -S
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: source only upload (original source is included)
@@ -44,24 +44,26 @@ dpkg-architecture: warning: no utmp entry available and LOGNAME not defined; usi
    -> Trying debhelper
  -> Considering build-dep libdshconfig1-dev (>= 0.20.11-1)
    -> Trying libdshconfig1-dev
- -> Installing  debhelper libdshconfig1-dev
+ -> Considering build-dep po4a
+   -> Trying po4a
+ -> Installing  debhelper libdshconfig1-dev po4a
 Reading package lists...
 Building dependency tree...
 The following extra packages will be installed:
   file gettext gettext-base html2text intltool-debian libdshconfig1 libmagic1
-  po-debconf
+  libsgmls-perl libsp1c2 po-debconf sp
 Suggested packages:
-  dh-make cvs gettext-doc
+  dh-make cvs gettext-doc sgmlspl sgmls-doc doc-base sgml-data
 Recommended packages:
-  libmail-sendmail-perl libcompress-zlib-perl
+  libmail-sendmail-perl libcompress-zlib-perl libterm-readkey-perl
 The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
-  libdshconfig1-dev libmagic1 po-debconf
-0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3482kB of archives.
-After unpacking 11.9MB of additional disk space will be used.
-Get:1 http://cdn.debian.or.jp etch/main libmagic1 4.17-5etch1 [276kB]
-Get:2 http://cdn.debian.or.jp etch/main file 4.17-5etch1 [32.1kB]
+  libdshconfig1-dev libmagic1 libsgmls-perl libsp1c2 po-debconf po4a sp
+0 upgraded, 14 newly installed, 0 to remove and 0 not upgraded.
+Need to get 5775kB of archives.
+After unpacking 19.3MB of additional disk space will be used.
+Get:1 http://cdn.debian.or.jp etch/main libmagic1 4.17-5etch2 [276kB]
+Get:2 http://cdn.debian.or.jp etch/main file 4.17-5etch2 [32.2kB]
 Get:3 http://cdn.debian.or.jp etch/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://cdn.debian.or.jp etch/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://cdn.debian.or.jp etch/main gettext 0.16.1-1 [2261kB]
@@ -70,12 +72,16 @@ Get:7 http://cdn.debian.or.jp etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp etch/main debhelper 5.0.42 [510kB]
 Get:9 http://cdn.debian.or.jp etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
+Get:11 http://cdn.debian.or.jp etch/main libsgmls-perl 1.03ii-31 [29.3kB]
+Get:12 http://cdn.debian.or.jp etch/main libsp1c2 1.3.4-1.2.1-47 [1386kB]
+Get:13 http://cdn.debian.or.jp etch/main sp 1.3.4-1.2.1-47 [182kB]
+Get:14 http://cdn.debian.or.jp etch/main po4a 0.29-1 [695kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12033 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.17-5etch1_amd64.deb) ...
+Unpacking libmagic1 (from .../libmagic1_4.17-5etch2_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../file_4.17-5etch1_amd64.deb) ...
+Unpacking file (from .../file_4.17-5etch2_amd64.deb) ...
 Selecting previously deselected package gettext-base.
 Unpacking gettext-base (from .../gettext-base_0.16.1-1_amd64.deb) ...
 Selecting previously deselected package html2text.
@@ -92,9 +98,17 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
-Setting up libmagic1 (4.17-5etch1) ...
+Selecting previously deselected package libsgmls-perl.
+Unpacking libsgmls-perl (from .../libsgmls-perl_1.03ii-31_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.29-1_all.deb) ...
+Setting up libmagic1 (4.17-5etch2) ...
 
-Setting up file (4.17-5etch1) ...
+Setting up file (4.17-5etch2) ...
 Setting up gettext-base (0.16.1-1) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -107,6 +121,12 @@ Setting up debhelper (5.0.42) ...
 Setting up libdshconfig1 (0.20.12-2) ...
 
 Setting up libdshconfig1-dev (0.20.12-2) ...
+Setting up libsgmls-perl (1.03ii-31) ...
+Setting up libsp1c2 (1.3.4-1.2.1-47) ...
+
+Setting up sp (1.3.4-1.2.1-47) ...
+
+Setting up po4a (0.29-1) ...
  -> Finished parsing the build-deps
 Reading package lists...
 Building dependency tree...
@@ -118,46 +138,46 @@ After unpacking 406kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp etch/main fakeroot 1.5.10 [97.4kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12703 files and directories currently installed.)
+(Reading database ... 12959 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
 Copying source file
-    -> copying [../dsh_0.25.8-1.dsc]
-    -> copying [../dsh_0.25.8.orig.tar.gz]
-    -> copying [../dsh_0.25.8-1.diff.gz]
+    -> copying [../dsh_0.25.9-1.dsc]
+    -> copying [../dsh_0.25.9.orig.tar.gz]
+    -> copying [../dsh_0.25.9-1.diff.gz]
 Extracting source
-dpkg-source: warning: extracting unsigned source package (./dsh_0.25.8-1.dsc)
-dpkg-source: extracting dsh in dsh-0.25.8
-dpkg-source: unpacking dsh_0.25.8.orig.tar.gz
-dpkg-source: applying ./dsh_0.25.8-1.diff.gz
+dpkg-source: warning: extracting unsigned source package (./dsh_0.25.9-1.dsc)
+dpkg-source: extracting dsh in dsh-0.25.9
+dpkg-source: unpacking dsh_0.25.9.orig.tar.gz
+dpkg-source: applying ./dsh_0.25.9-1.diff.gz
  -> Building the package
 dpkg-buildpackage: source package is dsh
-dpkg-buildpackage: source version is 0.25.8-1
+dpkg-buildpackage: source version is 0.25.9-1
 dpkg-buildpackage: source changed by Junichi Uekawa <dancer@debian.org>
 dpkg-buildpackage: host architecture amd64
-dpkg-buildpackage: source version without epoch 0.25.8-1
+dpkg-buildpackage: source version without epoch 0.25.9-1
  fakeroot debian/rules clean
 dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 dh_clean
- dpkg-source -b dsh-0.25.8
-dpkg-source: building dsh using existing dsh_0.25.8.orig.tar.gz
-dpkg-source: building dsh in dsh_0.25.8-1.diff.gz
+ dpkg-source -b dsh-0.25.9
+dpkg-source: building dsh using existing dsh_0.25.9.orig.tar.gz
+dpkg-source: building dsh in dsh_0.25.9-1.diff.gz
 dpkg-source: warning: file debian/compat has no final newline (either original or modified version)
 dpkg-source: warning: file dcp.sh has no final newline (either original or modified version)
-dpkg-source: building dsh in dsh_0.25.8-1.dsc
+dpkg-source: building dsh in dsh_0.25.9-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
@@ -204,7 +224,7 @@ checking if the linker (/usr/bin/ld) is GNU ld... yes
 checking for /usr/bin/ld option to reload object files... -r
 checking for BSD-compatible nm... /usr/bin/nm -B
 checking whether ln -s works... yes
-checking how to recognise dependent libraries... pass_all
+checking how to recognize dependent libraries... pass_all
 checking for sys/types.h... yes
 checking for sys/stat.h... yes
 checking for stdlib.h... yes
@@ -249,7 +269,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... 32768
+checking the maximum length of command line arguments... 98304
 checking command to parse /usr/bin/nm -B output from gcc object... ok
 checking for objdir... .libs
 checking for ar... ar
@@ -344,18 +364,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making all in m4
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making all in po
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -364,30 +384,30 @@ if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDL
 	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --tag=CC --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
-gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
+gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so  
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make check
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making check in m4
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making check in po
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  dsh
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -438,7 +458,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
-Wed Aug  1 03:09:43 UTC 2007
+Fri Aug 17 03:10:57 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -508,7 +528,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
-Wed Aug  1 03:09:48 UTC 2007
+Fri Aug 17 03:11:02 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -524,9 +544,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -534,58 +554,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/tmp/buildd/dsh-0.25.8/debian/dsh
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+/usr/bin/make install DESTDIR=/tmp/buildd/dsh-0.25.9/debian/dsh
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making install in m4
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making install in po
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/gettext/po/$file; \
+			    /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
-test -z "/usr/bin" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
+test -z "/usr/bin" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-cp /tmp/buildd/dsh-0.25.8/debian/machines.list /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/machines.list
-cp /tmp/buildd/dsh-0.25.8/dsh.conf /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/group/all
-install -d /tmp/buildd/dsh-0.25.8/debian/dsh/usr/lib/update-cluster
-install -m 755 /tmp/buildd/dsh-0.25.8/debian/dsh.updatelist /tmp/buildd/dsh-0.25.8/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+cp /tmp/buildd/dsh-0.25.9/debian/machines.list /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/machines.list
+cp /tmp/buildd/dsh-0.25.9/dsh.conf /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/group/all
+install -d /tmp/buildd/dsh-0.25.9/debian/dsh/usr/lib/update-cluster
+install -m 755 /tmp/buildd/dsh-0.25.9/debian/dsh.updatelist /tmp/buildd/dsh-0.25.9/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -602,7 +622,7 @@ dh_installdeb
 dh_gencontrol
 dh_md5sums
 dh_builddeb
-dpkg-deb: building package `dsh' in `../dsh_0.25.8-1_amd64.deb'.
+dpkg-deb: building package `dsh' in `../dsh_0.25.9-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
diff --git a/testsuite/normal/pdebuild-normal-lenny.log b/testsuite/normal/pdebuild-normal-lenny.log
index 2625f33..b8686a2 100644
--- a/testsuite/normal/pdebuild-normal-lenny.log
+++ b/testsuite/normal/pdebuild-normal-lenny.log
@@ -1,28 +1,28 @@
 dpkg-buildpackage: source package is dsh
-dpkg-buildpackage: source version is 0.25.8-1
+dpkg-buildpackage: source version is 0.25.9-1
 dpkg-buildpackage: source changed by Junichi Uekawa <dancer@debian.org>
-dpkg-buildpackage: source version without epoch 0.25.8-1
+dpkg-buildpackage: source version without epoch 0.25.9-1
  fakeroot debian/rules clean
 dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 dh_clean
- dpkg-source -b dsh-0.25.8
-dpkg-source: building dsh using existing dsh_0.25.8.orig.tar.gz
-dpkg-source: building dsh in dsh_0.25.8-1.diff.gz
+ dpkg-source -b dsh-0.25.9
+dpkg-source: building dsh using existing dsh_0.25.9.orig.tar.gz
+dpkg-source: building dsh in dsh_0.25.9-1.diff.gz
 dpkg-source: warning: file debian/compat has no final newline (either original or modified version)
 dpkg-source: warning: file dcp.sh has no final newline (either original or modified version)
-dpkg-source: building dsh in dsh_0.25.8-1.dsc
+dpkg-source: building dsh in dsh_0.25.9-1.dsc
  dpkg-genchanges -S
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: source only upload (original source is included)
@@ -43,45 +43,51 @@ Installing the build-deps
    -> Trying debhelper
  -> Considering build-dep libdshconfig1-dev (>= 0.20.11-1)
    -> Trying libdshconfig1-dev
- -> Installing  debhelper libdshconfig1-dev
+ -> Considering build-dep po4a
+   -> Trying po4a
+ -> Installing  debhelper libdshconfig1-dev po4a
 Reading package lists...
 Building dependency tree...
 Reading state information...
 The following extra packages will be installed:
   file gettext gettext-base html2text intltool-debian libdshconfig1 libmagic1
-  po-debconf
+  libsgmls-perl libsp1c2 po-debconf sp
 Suggested packages:
-  dh-make cvs gettext-doc
+  dh-make cvs gettext-doc sgmlspl sgmls-doc doc-base sgml-data
 Recommended packages:
-  libmail-sendmail-perl libcompress-zlib-perl
+  libmail-sendmail-perl libcompress-zlib-perl libterm-readkey-perl
 The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
-  libdshconfig1-dev libmagic1 po-debconf
-0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3562kB of archives.
-After unpacking 12.1MB of additional disk space will be used.
+  libdshconfig1-dev libmagic1 libsgmls-perl libsp1c2 po-debconf po4a sp
+0 upgraded, 14 newly installed, 0 to remove and 0 not upgraded.
+Need to get 5888kB of archives.
+After unpacking 19.3MB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main libmagic1 4.21-2 [332kB]
 Get:2 http://cdn.debian.or.jp lenny/main file 4.21-2 [40.0kB]
-Get:3 http://cdn.debian.or.jp lenny/main gettext-base 0.16.1-1 [132kB]
+Get:3 http://cdn.debian.or.jp lenny/main gettext-base 0.16.1-2 [133kB]
 Get:4 http://cdn.debian.or.jp lenny/main html2text 1.3.2a-3 [92.7kB]
-Get:5 http://cdn.debian.or.jp lenny/main gettext 0.16.1-1 [2261kB]
+Get:5 http://cdn.debian.or.jp lenny/main gettext 0.16.1-2 [2269kB]
 Get:6 http://cdn.debian.or.jp lenny/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:7 http://cdn.debian.or.jp lenny/main po-debconf 1.0.9 [117kB]
 Get:8 http://cdn.debian.or.jp lenny/main debhelper 5.0.53 [520kB]
 Get:9 http://cdn.debian.or.jp lenny/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp lenny/main libdshconfig1-dev 0.20.12-2 [25.3kB]
+Get:11 http://cdn.debian.or.jp lenny/main libsgmls-perl 1.03ii-31 [29.3kB]
+Get:12 http://cdn.debian.or.jp lenny/main libsp1c2 1.3.4-1.2.1-47 [1386kB]
+Get:13 http://cdn.debian.or.jp lenny/main sp 1.3.4-1.2.1-47 [182kB]
+Get:14 http://cdn.debian.or.jp lenny/main po4a 0.31-1 [720kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11050 files and directories currently installed.)
+(Reading database ... 11043 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.21-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.21-2_amd64.deb) ...
 Selecting previously deselected package gettext-base.
-Unpacking gettext-base (from .../gettext-base_0.16.1-1_amd64.deb) ...
+Unpacking gettext-base (from .../gettext-base_0.16.1-2_amd64.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
-Unpacking gettext (from .../gettext_0.16.1-1_amd64.deb) ...
+Unpacking gettext (from .../gettext_0.16.1-2_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.
@@ -92,14 +98,22 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
+Selecting previously deselected package libsgmls-perl.
+Unpacking libsgmls-perl (from .../libsgmls-perl_1.03ii-31_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.31-1_all.deb) ...
 Setting up libmagic1 (4.21-2) ...
 
 Setting up file (4.21-2) ...
-Setting up gettext-base (0.16.1-1) ...
+Setting up gettext-base (0.16.1-2) ...
 
 Setting up html2text (1.3.2a-3) ...
 
-Setting up gettext (0.16.1-1) ...
+Setting up gettext (0.16.1-2) ...
 
 Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.9) ...
@@ -107,6 +121,12 @@ Setting up debhelper (5.0.53) ...
 Setting up libdshconfig1 (0.20.12-2) ...
 
 Setting up libdshconfig1-dev (0.20.12-2) ...
+Setting up libsgmls-perl (1.03ii-31) ...
+Setting up libsp1c2 (1.3.4-1.2.1-47) ...
+
+Setting up sp (1.3.4-1.2.1-47) ...
+
+Setting up po4a (0.31-1) ...
  -> Finished parsing the build-deps
 Reading package lists...
 Building dependency tree...
@@ -119,46 +139,46 @@ After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main fakeroot 1.7.1 [111kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11730 files and directories currently installed.)
+(Reading database ... 11985 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
 Copying source file
-    -> copying [../dsh_0.25.8-1.dsc]
-    -> copying [../dsh_0.25.8.orig.tar.gz]
-    -> copying [../dsh_0.25.8-1.diff.gz]
+    -> copying [../dsh_0.25.9-1.dsc]
+    -> copying [../dsh_0.25.9.orig.tar.gz]
+    -> copying [../dsh_0.25.9-1.diff.gz]
 Extracting source
-dpkg-source: warning: extracting unsigned source package (./dsh_0.25.8-1.dsc)
-dpkg-source: extracting dsh in dsh-0.25.8
-dpkg-source: unpacking dsh_0.25.8.orig.tar.gz
-dpkg-source: applying ./dsh_0.25.8-1.diff.gz
+dpkg-source: warning: extracting unsigned source package (./dsh_0.25.9-1.dsc)
+dpkg-source: extracting dsh in dsh-0.25.9
+dpkg-source: unpacking dsh_0.25.9.orig.tar.gz
+dpkg-source: applying ./dsh_0.25.9-1.diff.gz
  -> Building the package
 dpkg-buildpackage: source package is dsh
-dpkg-buildpackage: source version is 0.25.8-1
+dpkg-buildpackage: source version is 0.25.9-1
 dpkg-buildpackage: source changed by Junichi Uekawa <dancer@debian.org>
 dpkg-buildpackage: host architecture amd64
-dpkg-buildpackage: source version without epoch 0.25.8-1
+dpkg-buildpackage: source version without epoch 0.25.9-1
  fakeroot debian/rules clean
 dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 dh_clean
- dpkg-source -b dsh-0.25.8
-dpkg-source: building dsh using existing dsh_0.25.8.orig.tar.gz
-dpkg-source: building dsh in dsh_0.25.8-1.diff.gz
+ dpkg-source -b dsh-0.25.9
+dpkg-source: building dsh using existing dsh_0.25.9.orig.tar.gz
+dpkg-source: building dsh in dsh_0.25.9-1.diff.gz
 dpkg-source: warning: file debian/compat has no final newline (either original or modified version)
 dpkg-source: warning: file dcp.sh has no final newline (either original or modified version)
-dpkg-source: building dsh in dsh_0.25.8-1.dsc
+dpkg-source: building dsh in dsh_0.25.9-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
@@ -205,7 +225,7 @@ checking if the linker (/usr/bin/ld) is GNU ld... yes
 checking for /usr/bin/ld option to reload object files... -r
 checking for BSD-compatible nm... /usr/bin/nm -B
 checking whether ln -s works... yes
-checking how to recognise dependent libraries... pass_all
+checking how to recognize dependent libraries... pass_all
 checking for sys/types.h... yes
 checking for sys/stat.h... yes
 checking for stdlib.h... yes
@@ -250,7 +270,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... 32768
+checking the maximum length of command line arguments... 98304
 checking command to parse /usr/bin/nm -B output from gcc object... ok
 checking for objdir... .libs
 checking for ar... ar
@@ -345,18 +365,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making all in m4
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making all in po
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -365,30 +385,30 @@ if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDL
 	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --tag=CC --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
-gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
+gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so  
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make check
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making check in m4
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making check in po
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  dsh
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -435,11 +455,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
-Wed Aug  1 03:17:26 UTC 2007
+Fri Aug 17 03:18:53 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -509,14 +529,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
-Wed Aug  1 03:17:31 UTC 2007
+Fri Aug 17 03:18:58 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-c: c
-dsh: Process terminated (before write).
 a: a
 b: b
+c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -525,9 +545,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -535,58 +555,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/tmp/buildd/dsh-0.25.8/debian/dsh
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+/usr/bin/make install DESTDIR=/tmp/buildd/dsh-0.25.9/debian/dsh
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making install in m4
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making install in po
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/gettext/po/$file; \
+			    /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
-test -z "/usr/bin" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
+test -z "/usr/bin" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-cp /tmp/buildd/dsh-0.25.8/debian/machines.list /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/machines.list
-cp /tmp/buildd/dsh-0.25.8/dsh.conf /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/group/all
-install -d /tmp/buildd/dsh-0.25.8/debian/dsh/usr/lib/update-cluster
-install -m 755 /tmp/buildd/dsh-0.25.8/debian/dsh.updatelist /tmp/buildd/dsh-0.25.8/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+cp /tmp/buildd/dsh-0.25.9/debian/machines.list /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/machines.list
+cp /tmp/buildd/dsh-0.25.9/dsh.conf /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/group/all
+install -d /tmp/buildd/dsh-0.25.9/debian/dsh/usr/lib/update-cluster
+install -m 755 /tmp/buildd/dsh-0.25.9/debian/dsh.updatelist /tmp/buildd/dsh-0.25.9/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -603,7 +623,7 @@ dh_installdeb
 dh_gencontrol
 dh_md5sums
 dh_builddeb
-dpkg-deb: building package `dsh' in `../dsh_0.25.8-1_amd64.deb'.
+dpkg-deb: building package `dsh' in `../dsh_0.25.9-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 9d2e548..05054ca 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -1,28 +1,28 @@
 dpkg-buildpackage: source package is dsh
-dpkg-buildpackage: source version is 0.25.8-1
+dpkg-buildpackage: source version is 0.25.9-1
 dpkg-buildpackage: source changed by Junichi Uekawa <dancer@debian.org>
-dpkg-buildpackage: source version without epoch 0.25.8-1
+dpkg-buildpackage: source version without epoch 0.25.9-1
  fakeroot debian/rules clean
 dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.8'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 dh_clean
- dpkg-source -b dsh-0.25.8
-dpkg-source: building dsh using existing dsh_0.25.8.orig.tar.gz
-dpkg-source: building dsh in dsh_0.25.8-1.diff.gz
+ dpkg-source -b dsh-0.25.9
+dpkg-source: building dsh using existing dsh_0.25.9.orig.tar.gz
+dpkg-source: building dsh in dsh_0.25.9-1.diff.gz
 dpkg-source: warning: file debian/compat has no final newline (either original or modified version)
 dpkg-source: warning: file dcp.sh has no final newline (either original or modified version)
-dpkg-source: building dsh in dsh_0.25.8-1.dsc
+dpkg-source: building dsh in dsh_0.25.9-1.dsc
  dpkg-genchanges -S
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: source only upload (original source is included)
@@ -43,23 +43,25 @@ Installing the build-deps
    -> Trying debhelper
  -> Considering build-dep libdshconfig1-dev (>= 0.20.11-1)
    -> Trying libdshconfig1-dev
- -> Installing  debhelper libdshconfig1-dev
+ -> Considering build-dep po4a
+   -> Trying po4a
+ -> Installing  debhelper libdshconfig1-dev po4a
 Reading package lists...
 Building dependency tree...
 Reading state information...
 The following extra packages will be installed:
   file gettext gettext-base html2text intltool-debian libdshconfig1 libmagic1
-  po-debconf
+  libsgmls-perl libsp1c2 po-debconf sp
 Suggested packages:
-  dh-make cvs gettext-doc
+  dh-make cvs gettext-doc sgmlspl sgmls-doc doc-base sgml-data
 Recommended packages:
-  libmail-sendmail-perl libcompress-zlib-perl
+  libmail-sendmail-perl libcompress-zlib-perl libterm-readkey-perl
 The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
-  libdshconfig1-dev libmagic1 po-debconf
-0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3571kB of archives.
-After unpacking 12.1MB of additional disk space will be used.
+  libdshconfig1-dev libmagic1 libsgmls-perl libsp1c2 po-debconf po4a sp
+0 upgraded, 14 newly installed, 0 to remove and 0 not upgraded.
+Need to get 5888kB of archives.
+After unpacking 19.3MB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.21-2 [332kB]
 Get:2 http://cdn.debian.or.jp sid/main file 4.21-2 [40.0kB]
 Get:3 http://cdn.debian.or.jp sid/main gettext-base 0.16.1-2 [133kB]
@@ -68,11 +70,15 @@ Get:5 http://cdn.debian.or.jp sid/main gettext 0.16.1-2 [2269kB]
 Get:6 http://cdn.debian.or.jp sid/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:7 http://cdn.debian.or.jp sid/main po-debconf 1.0.9 [117kB]
 Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.53 [520kB]
-Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.12-2 [10.9kB]
-Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
+Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.13-1 [11.0kB]
+Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.13-1 [25.4kB]
+Get:11 http://cdn.debian.or.jp sid/main libsgmls-perl 1.03ii-31 [29.3kB]
+Get:12 http://cdn.debian.or.jp sid/main libsp1c2 1.3.4-1.2.1-47 [1386kB]
+Get:13 http://cdn.debian.or.jp sid/main sp 1.3.4-1.2.1-47 [182kB]
+Get:14 http://cdn.debian.or.jp sid/main po4a 0.31-1 [720kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11089 files and directories currently installed.)
+(Reading database ... 11096 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.21-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.21-2_amd64.deb) ...
@@ -89,9 +95,17 @@ Unpacking po-debconf (from .../po-debconf_1.0.9_all.deb) ...
 Selecting previously deselected package debhelper.
 Unpacking debhelper (from .../debhelper_5.0.53_all.deb) ...
 Selecting previously deselected package libdshconfig1.
-Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
+Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
-Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
+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-31_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.31-1_all.deb) ...
 Setting up libmagic1 (4.21-2) ...
 
 Setting up file (4.21-2) ...
@@ -104,9 +118,15 @@ Setting up gettext (0.16.1-2) ...
 Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.9) ...
 Setting up debhelper (5.0.53) ...
-Setting up libdshconfig1 (0.20.12-2) ...
+Setting up libdshconfig1 (0.20.13-1) ...
 
-Setting up libdshconfig1-dev (0.20.12-2) ...
+Setting up libdshconfig1-dev (0.20.13-1) ...
+Setting up libsgmls-perl (1.03ii-31) ...
+Setting up libsp1c2 (1.3.4-1.2.1-47) ...
+
+Setting up sp (1.3.4-1.2.1-47) ...
+
+Setting up po4a (0.31-1) ...
  -> Finished parsing the build-deps
 Reading package lists...
 Building dependency tree...
@@ -119,46 +139,46 @@ After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main fakeroot 1.7.1 [111kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11770 files and directories currently installed.)
+(Reading database ... 12038 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
 Copying source file
-    -> copying [../dsh_0.25.8-1.dsc]
-    -> copying [../dsh_0.25.8.orig.tar.gz]
-    -> copying [../dsh_0.25.8-1.diff.gz]
+    -> copying [../dsh_0.25.9-1.dsc]
+    -> copying [../dsh_0.25.9.orig.tar.gz]
+    -> copying [../dsh_0.25.9-1.diff.gz]
 Extracting source
-dpkg-source: warning: extracting unsigned source package (./dsh_0.25.8-1.dsc)
-dpkg-source: extracting dsh in dsh-0.25.8
-dpkg-source: unpacking dsh_0.25.8.orig.tar.gz
-dpkg-source: applying ./dsh_0.25.8-1.diff.gz
+dpkg-source: warning: extracting unsigned source package (./dsh_0.25.9-1.dsc)
+dpkg-source: extracting dsh in dsh-0.25.9
+dpkg-source: unpacking dsh_0.25.9.orig.tar.gz
+dpkg-source: applying ./dsh_0.25.9-1.diff.gz
  -> Building the package
 dpkg-buildpackage: source package is dsh
-dpkg-buildpackage: source version is 0.25.8-1
+dpkg-buildpackage: source version is 0.25.9-1
 dpkg-buildpackage: source changed by Junichi Uekawa <dancer@debian.org>
 dpkg-buildpackage: host architecture amd64
-dpkg-buildpackage: source version without epoch 0.25.8-1
+dpkg-buildpackage: source version without epoch 0.25.9-1
  fakeroot debian/rules clean
 dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 make: [clean] Error 2 (ignored)
 dh_clean
- dpkg-source -b dsh-0.25.8
-dpkg-source: building dsh using existing dsh_0.25.8.orig.tar.gz
-dpkg-source: building dsh in dsh_0.25.8-1.diff.gz
+ dpkg-source -b dsh-0.25.9
+dpkg-source: building dsh using existing dsh_0.25.9.orig.tar.gz
+dpkg-source: building dsh in dsh_0.25.9-1.diff.gz
 dpkg-source: warning: file debian/compat has no final newline (either original or modified version)
 dpkg-source: warning: file dcp.sh has no final newline (either original or modified version)
-dpkg-source: building dsh in dsh_0.25.8-1.dsc
+dpkg-source: building dsh in dsh_0.25.9-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
@@ -205,7 +225,7 @@ checking if the linker (/usr/bin/ld) is GNU ld... yes
 checking for /usr/bin/ld option to reload object files... -r
 checking for BSD-compatible nm... /usr/bin/nm -B
 checking whether ln -s works... yes
-checking how to recognise dependent libraries... pass_all
+checking how to recognize dependent libraries... pass_all
 checking for sys/types.h... yes
 checking for sys/stat.h... yes
 checking for stdlib.h... yes
@@ -250,7 +270,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... 32768
+checking the maximum length of command line arguments... 98304
 checking command to parse /usr/bin/nm -B output from gcc object... ok
 checking for objdir... .libs
 checking for ar... ar
@@ -345,18 +365,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making all in m4
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making all in po
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -365,30 +385,30 @@ if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDL
 	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --tag=CC --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
-gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
+gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so  
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make check
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making check in m4
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making check in po
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  dsh
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -435,11 +455,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
-Wed Aug  1 03:04:29 UTC 2007
+Fri Aug 17 03:05:27 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -509,7 +529,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
-Wed Aug  1 03:04:34 UTC 2007
+Fri Aug 17 03:05:32 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -525,9 +545,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -535,58 +555,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/tmp/buildd/dsh-0.25.8/debian/dsh
-make[1]: Entering directory `/tmp/buildd/dsh-0.25.8'
+/usr/bin/make install DESTDIR=/tmp/buildd/dsh-0.25.9/debian/dsh
+make[1]: Entering directory `/tmp/buildd/dsh-0.25.9'
 Making install in m4
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8/m4'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/m4'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/m4'
 Making install in po
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share
-mkdir -p -- /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share
+mkdir -p -- /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/gettext/po/$file; \
+			    /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
-make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
-make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
-test -z "/usr/bin" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.8/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9/po'
+make[2]: Entering directory `/tmp/buildd/dsh-0.25.9'
+make[3]: Entering directory `/tmp/buildd/dsh-0.25.9'
+test -z "/usr/bin" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.9/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/tmp/buildd/dsh-0.25.8/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-make[1]: Leaving directory `/tmp/buildd/dsh-0.25.8'
-cp /tmp/buildd/dsh-0.25.8/debian/machines.list /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/machines.list
-cp /tmp/buildd/dsh-0.25.8/dsh.conf /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /tmp/buildd/dsh-0.25.8/debian/dsh/etc/dsh/group/all
-install -d /tmp/buildd/dsh-0.25.8/debian/dsh/usr/lib/update-cluster
-install -m 755 /tmp/buildd/dsh-0.25.8/debian/dsh.updatelist /tmp/buildd/dsh-0.25.8/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/tmp/buildd/dsh-0.25.9/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[2]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+make[1]: Leaving directory `/tmp/buildd/dsh-0.25.9'
+cp /tmp/buildd/dsh-0.25.9/debian/machines.list /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/machines.list
+cp /tmp/buildd/dsh-0.25.9/dsh.conf /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /tmp/buildd/dsh-0.25.9/debian/dsh/etc/dsh/group/all
+install -d /tmp/buildd/dsh-0.25.9/debian/dsh/usr/lib/update-cluster
+install -m 755 /tmp/buildd/dsh-0.25.9/debian/dsh.updatelist /tmp/buildd/dsh-0.25.9/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -603,7 +623,7 @@ dh_installdeb
 dh_gencontrol
 dh_md5sums
 dh_builddeb
-dpkg-deb: building package `dsh' in `../dsh_0.25.8-1_amd64.deb'.
+dpkg-deb: building package `dsh' in `../dsh_0.25.9-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)