--- a/dev/debian-build/dbuild	Wed Sep 07 11:05:13 2011 +0100
+++ b/dev/debian-build/dbuild	Wed Sep 07 11:17:12 2011 +0100
@@ -8,18 +8,17 @@
 DEBIAN_VERSION=$(dpkg-parsechangelog | sed -n 's/^Version: \(.*\)/\1/p')
 # Lazy, but hey
 UPSTREAM_VERSION=$(dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-[^-]*/\1/p')
-UPSTREAM=$(hg log --template '{node}' -r 'heads(ancestors(.) and branch(default))')
 BUILDDIR=$(pwd)/build/debian
 
 echo PACKAGE $PACKAGE
 echo DEBIAN_VERSION $DEBIAN_VERSION
 echo UPSTREAM_VERSION $UPSTREAM_VERSION
-echo UPSTREAM $UPSTREAM
 echo BUILDDIR $BUILDDIR
 
 rm -rf ${BUILDDIR}
 mkdir -p ${BUILDDIR}
-hg archive -X '.hg*' -X 'dev/**' -t tgz -r ${UPSTREAM} \
+hg st -mac0n -X '.hg*' -X 'dev/**' -X 'debian/**' | \
+    cpio -o -0 -H ustar | gzip --best > \
    ${BUILDDIR}/${PACKAGE}_${UPSTREAM_VERSION}.orig.tar.gz
 hg st -mac0n -X '.hg*' -X 'dev/**' | cpio -p -0 -d \
    ${BUILDDIR}/${PACKAGE}-${UPSTREAM_VERSION}