--- a/action/go	Tue Dec 01 15:31:03 2009 +0000
+++ b/action/go	Wed Dec 02 18:52:02 2009 +0000
@@ -13,15 +13,20 @@
 #aptitude --allow-untrusted --quiet --without-recommends --assume-yes  install mercurial
 #hg --version
 
+#aptitude --allow-untrusted --quiet --without-recommends --assume-yes  install \
+#    make mercurial xsltproc docbook-xsl openssh-server
+
 aptitude --allow-untrusted --quiet --without-recommends --assume-yes  install \
-    make mercurial xsltproc docbook-xsl openssh-server
+     debconf python python-support adduser mercurial openssh-server 
+     
 
 perl -i -pe 's/^Port 22$/Port 2222/' /etc/ssh/sshd_config
 /etc/init.d/ssh start
 ssh-keyscan -p 2222 localhost > /etc/ssh/ssh_known_hosts
 
-cd mercurial-server
-make setup-adduser
+dpkg -i mercurial-server_1.0-1_all.deb
+#cd mercurial-server
+#make setup-adduser
 
 for user in test1 test2 ; do
     adduser --gecos $user --disabled-password $user
@@ -29,7 +34,7 @@
     su -l -c 'ssh-keygen -N "" -f .ssh/id_rsa -t rsa' $user
 done
 cp /home/test1/.ssh/id_rsa.pub /etc/mercurial-server/keys/root/test1
-su -l -c /usr/local/share/mercurial-server/refresh-auth hg
+su -l -c /usr/share/mercurial-server/refresh-auth hg
 su -l -c /action/test1 test1
 su -l -c /action/test2 test2
 

--- a/run-test	Tue Dec 01 15:31:03 2009 +0000
+++ b/run-test	Wed Dec 02 18:52:02 2009 +0000
@@ -4,12 +4,15 @@
 
 set -e
 
-PRISTINE=/var/local/cache/pristine/sid
+DEBVERSION=sid
+
+PRISTINE=/var/local/cache/pristine/$DEBVERSION
 
 TOPDIR=`pwd`
 BACKING=$TOPDIR/build/env/backing
 MOUNT=$TOPDIR/build/env/mount
-mkdir -p $BACKING $MOUNT
+mkdir -p $TOPDIR/build/env
+mkdir $BACKING $MOUNT
 
 touch $BACKING/please-trash-this-system
 mkdir -p $BACKING/etc
@@ -17,12 +20,14 @@
 cp -v policy-rc.d $BACKING/etc/policy-rc.d
 
 mkdir -p $BACKING/var/cache/apt/archives
-cp -v build/aptcache/* $BACKING/var/cache/apt/archives
+cp -v build/aptcache/$DEBVERSION/* $BACKING/var/cache/apt/archives || true
 
 cp -av action $BACKING
 #hg -R ../mercurial-server archive -r default $BACKING/action/mercurial-server
-( cd ../mercurial-server && \
-    hg st -mac0n | cpio -p -0 -d $BACKING/action/mercurial-server )
+#( cd ../mercurial-server && \
+#    hg st -mac0n | cpio -p -0 -d $BACKING/action/mercurial-server )
+
+cp ../mercurial-server/build/debian/mercurial-server_1.0-1_all.deb $BACKING/action
 
 unionfs-fuse -o cow -o allow_other,suid,dev $BACKING=RW:$PRISTINE=RO $MOUNT