# HG changeset patch
# User Paul Crowley <paul@lshift.net>
# Date 1315389384 -3600
# Node ID b44dd7bad82c4c8b5aafa3e1a8c5684a49bb84b0
# Parent  36400dcefb67ad5cd42ca77906c3ba3fad600d20# Parent  ed581082bb664077547a77b2c316c3a8300a3bf5
Start work on single-headed way of doing things - merge debian into default

diff -r ed581082bb66 -r b44dd7bad82c dev/chroot-test/action/install-installables
--- a/dev/chroot-test/action/install-installables	Wed Sep 07 10:41:21 2011 +0100
+++ b/dev/chroot-test/action/install-installables	Wed Sep 07 10:56:24 2011 +0100
@@ -1,4 +1,12 @@
-aptitude --allow-untrusted --quiet --without-recommends --assume-yes  install \
-     debconf python python-support adduser openssh-server ucf
-echo dpkg -i /var/cache/apt/archives/mercurial-common_*.deb /var/cache/apt/archives/mercurial_*.deb *.deb
-dpkg -i /var/cache/apt/archives/mercurial-common_*.deb /var/cache/apt/archives/mercurial_*.deb *.deb
+if $CHROOT_TEST_INSTALLDEB ; then
+    aptitude --allow-untrusted --quiet --without-recommends --assume-yes  install \
+         debconf python python-support adduser openssh-server ucf
+    echo dpkg -i /var/cache/apt/archives/mercurial-common_*.deb /var/cache/apt/archives/mercurial_*.deb *.deb
+    dpkg -i /var/cache/apt/archives/mercurial-common_*.deb /var/cache/apt/archives/mercurial_*.deb *.deb
+else
+    aptitude --allow-untrusted --quiet --without-recommends --assume-yes  install \
+        make mercurial xsltproc docbook-xsl openssh-server \
+        python python-support adduser
+    cd mercurial-server
+    make setup-adduser
+fi
diff -r ed581082bb66 -r b44dd7bad82c dev/chroot-test/action/refresh-auth
--- a/dev/chroot-test/action/refresh-auth	Wed Sep 07 10:41:21 2011 +0100
+++ b/dev/chroot-test/action/refresh-auth	Wed Sep 07 10:56:24 2011 +0100
@@ -2,4 +2,10 @@
 
 set -e
 
-/usr/share/mercurial-server/refresh-auth
+. /action/env
+
+if $CHROOT_TEST_INSTALLDEB ; then
+    /usr/share/mercurial-server/refresh-auth
+else
+    /usr/local/share/mercurial-server/refresh-auth
+fi
diff -r ed581082bb66 -r b44dd7bad82c dev/chroot-test/copy-installables
--- a/dev/chroot-test/copy-installables	Wed Sep 07 10:41:21 2011 +0100
+++ b/dev/chroot-test/copy-installables	Wed Sep 07 10:56:24 2011 +0100
@@ -1,1 +1,6 @@
-cp build/debian/*.deb $BACKING/action
+if $CHROOT_TEST_INSTALLDEB ; then
+    cp build/debian/*.deb $BACKING/action
+else
+    hg st -mac0n -X '.hg*' -X 'dev/**' \
+        | cpio -p -0 -d $BACKING/action/mercurial-server
+fi