Try to allow 64-bit deb builds too.

diff --git a/builds/chroot-deb b/builds/chroot-deb
index a0f5f7d850ada6f2c3ff9587858bbb74421d5989..c7cc4641d60cfba8061f0b5bf010e2089cf5d10b 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
 
+if [ "$BITS" == 32 ]; then
+  CPU=i386
+else
+  CPU=amd64
+fi
+
 cp builds/control-$UBUNTU_VERSION 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

diff --git a/builds/deb b/builds/deb
index fa98f349c8831fcb7f6e03b476acd0f122e9c136..bb7e33cceae00c394116d50fb2571ed161bccfad 100755 (executable)
--- a/builds/deb
+++ b/builds/deb
@@ -7,6 +7,12 @@ if [ "$UBUNTU_VERSION" == "" -o "$BITS" == "" ]; then
   exit 1
 fi
 
+if [ "$BITS" == 32 ]; then
+  CPU=i386
+else
+  CPU=amd64
+fi
+
 ID=$UBUNTU_VERSION-$BITS
 CHROOT=/home/carl/Environments/ubuntu-$ID
 TARBALL=`ls -1 *.tar.bz2`
@@ -18,9 +24,9 @@ echo "tarball: $TARBALL"
 echo "version: $VERSION"
 
 sudo cp *.tar.bz2 $CHROOT/root/
-sudo schroot -c "ubuntu-$ID" -d /root -u root -- /bin/sh -c "tar xjf dvdomatic-$VERSION.tar.bz2 && cd dvdomatic-$VERSION && builds/chroot-deb $UBUNTU_VERSION"
+sudo schroot -c "ubuntu-$ID" -d /root -u root -- /bin/sh -c "tar xjf dvdomatic-$VERSION.tar.bz2 && cd dvdomatic-$VERSION && builds/chroot-deb $UBUNTU_VERSION $BITS"
 mkdir -p build/deb/$ID/
-echo "Copying $CHROOT/root/dvdomatic-$VERSION/build/deb/dvdomatic_$VERSION-1_i386.deb to build/deb/$ID"
-sudo ls -lh $CHROOT/root/dvdomatic-$VERSION/build/deb/dvdomatic_$VERSION-1_i386.deb
-sudo cp -v $CHROOT/root/dvdomatic-$VERSION/build/deb/dvdomatic_$VERSION-1_i386.deb build/deb/$ID/
+echo "Copying $CHROOT/root/dvdomatic-$VERSION/build/deb/dvdomatic_$VERSION-1_$CPU.deb to build/deb/$ID"
+sudo ls -lh $CHROOT/root/dvdomatic-$VERSION/build/deb/dvdomatic_$VERSION-1_$CPU.deb
+sudo cp -v $CHROOT/root/dvdomatic-$VERSION/build/deb/dvdomatic_$VERSION-1_$CPU.deb build/deb/$ID/