+ * depend on cdebootstrap, and suggest debootstrap. You may alternatively use

+    debootstrap, but the default is cdebootstrap.
+    (closes: #323843, #324648)
+  * cowdancer support improvement -- now passes testsuite.
+  * Standards-version: 3.6.2

update and re-run testsuite.

1 files changed, 25 insertions, 21 deletions

diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index 2124f9a..43a3202 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Wed Aug 17 08:09:50 JST 2005
-pbuilder-time-stamp: 1124233790
+Current time: Thu Aug 25 10:05:20 JST 2005
+pbuilder-time-stamp: 1124931920
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -13,7 +13,7 @@ Building the build Environment
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
 Installing the build-deps
- -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.19 2005/06/03 12:07:39 dancer Exp $
+ -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.20 2005/08/17 00:46:54 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
    -> Trying debhelper
  -> Considering  libdshconfig1-dev (>= 0.20.11-1)
@@ -36,7 +36,7 @@ Need to get 2650kB of archives.
 After unpacking 8360kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.12-1 [233kB]
 Get:2 http://ftp.jp.debian.org etch/main file 4.12-1 [28.6kB]
-Get:3 http://ftp.jp.debian.org etch/main debconf-utils 1.4.52 [32.9kB]
+Get:3 http://ftp.jp.debian.org etch/main debconf-utils 1.4.57 [33.0kB]
 Get:4 http://ftp.jp.debian.org etch/main html2text 1.3.2a-2 [92.6kB]
 Get:5 http://ftp.jp.debian.org etch/main gettext 0.14.5-2 [1775kB]
 Get:6 http://ftp.jp.debian.org etch/main intltool-debian 0.30+20040213 [23.5kB]
@@ -44,14 +44,14 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 4.9.5 [363kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2650kB in 1s (1750kB/s)
+Fetched 2650kB in 1s (1498kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11328 files and directories currently installed.)
+(Reading database ... 11409 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.12-1_i386.deb) ...
 Selecting previously deselected package debconf-utils.
-Unpacking debconf-utils (from .../debconf-utils_1.4.52_all.deb) ...
+Unpacking debconf-utils (from .../debconf-utils_1.4.57_all.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-2_i386.deb) ...
 Selecting previously deselected package gettext.
@@ -69,7 +69,7 @@ Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.11-1_i386.deb) ...
 Setting up libmagic1 (4.12-1) ...
 
 Setting up file (4.12-1) ...
-Setting up debconf-utils (1.4.52) ...
+Setting up debconf-utils (1.4.57) ...
 
 Setting up html2text (1.3.2a-2) ...
 
@@ -90,16 +90,19 @@ The following NEW packages will be installed:
 Need to get 70.4kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.3 [70.4kB]
-Fetched 70.4kB in 0s (534kB/s)
+Fetched 70.4kB in 0s (533kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11871 files and directories currently installed.)
+(Reading database ... 11952 files and directories currently installed.)
 Unpacking fakeroot (from .../archives/fakeroot_1.3_i386.deb) ...
 Setting up fakeroot (1.3) ...
 
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/6680/etc/passwd
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/6680/etc/group
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/6680/etc/shadow
 Copying source file
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -415,7 +418,7 @@ PASS: tests/param-r-invalid.sh
 1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Aug 16 23:10:36 UTC 2005
+Thu Aug 25 01:06:28 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -485,12 +488,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
-Tue Aug 16 23:10:42 UTC 2005
+Thu Aug 25 01:06:33 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-b: b
 a: a
+b: b
+dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -595,10 +599,10 @@ debian: warning: no utmp entry available and LOGNAME not defined; using uid of p
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
-/usr/lib/pbuilder/pbuilder-buildpackage: line 135:  3524 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
+/usr/lib/pbuilder/pbuilder-buildpackage: line 135:  6979 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Wed Aug 17 08:10:45 JST 2005
-pbuilder-time-stamp: 1124233845
+Current time: Thu Aug 25 10:06:40 JST 2005
+pbuilder-time-stamp: 1124932000
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/3229 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/6680 and its subdirectories