Merge branch 'master' of /home/carl/git/dvdomatic

[dcpomatic.git] / builds / chroot-deb

diff --git a/builds/chroot-deb b/builds/chroot-deb
index a0f5f7d850ada6f2c3ff9587858bbb74421d5989..881f9f8c33f07df9e8dc46e920399222e68daea5 100755 (executable)
--- a/builds/chroot-deb
+++ b/builds/chroot-deb
@@ -1,17 +1,24 @@
 #!/bin/bash -e
 
 UBUNTU_VERSION=$1
-if [ "$UBUNTU_VERSION" == "" ]; then
-  echo "Syntax: $0 <ubuntu version>"
+BITS=$2
+if [ "$UBUNTU_VERSION" == "" -o "$BITS" == "" ]; then
+  echo "Syntax: $0 <ubuntu version> <bits>"
   exit 1
 fi
 
-cp builds/control-$UBUNTU_VERSION debian/control
+if [ "$BITS" == 32 ]; then
+  CPU=i386
+else
+  CPU=amd64
+fi
+
+cp builds/control-$UBUNTU_VERSION-$BITS debian/control
 ./waf dist
 TARBALL=`ls -1 *.tar.bz2`
 VERSION=`echo $TARBALL | sed -e 's/^dvdomatic-\(.*\).tar.bz2/\1/'`
 
-echo "dvdomatic_$VERSION-1_i386.deb video extra" > debian/files
+echo "dvdomatic_$VERSION-1_$CPU.deb video extra" > debian/files
 
 rm -rf build/deb
 mkdir -p build/deb