From: Carl Hetherington <cth@carlh.net>
Date: Sun, 9 Dec 2012 21:29:17 +0000 (+0000)
Subject: Merge branch 'external-audio' of ssh://houllier/home/carl/git/dvdomatic into external... 
X-Git-Tag: v2.0.48~1471^2
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e22d80b761f7c208f68c2ad60a43b131dc24893e

Merge branch 'external-audio' of ssh://houllier/home/carl/git/dvdomatic into external-audio
---

e22d80b761f7c208f68c2ad60a43b131dc24893e
diff --cc builds/deb-12.04
index cc403e657,000000000..aea23509a
mode 100755,000000..100755
--- a/builds/deb-12.04
+++ b/builds/deb-12.04
@@@ -1,18 -1,0 +1,22 @@@
- #!/bin/bash
++#!/bin/bash -e
 +
 +cp -r builds/debian-12.04 debian
 +./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
++
 +rm -rf build/deb
- mkdir build/deb
++mkdir -p build/deb
 +cd build/deb
 +mv ../../*.tar.bz2 .
- TARBALL=`ls -1 *.tar.bz2`
- DEB_TARBALL=`echo $TARBALL | sed -e "s/dvdomatic-/dvdomatic_/" | sed -e "s/.tar.bz2/.orig.tar.bz2/"`
++DEB_TARBALL="dvdomatic_$VERSION.orig.tar.bz2"
 +echo "Renaming $TARBALL to $DEB_TARBALL"
 +mv $TARBALL $DEB_TARBALL
 +tar xjf $DEB_TARBALL
 +cd dvdomatic-*
 +dpkg-source -b .
 +dpkg-buildpackage
 +cp ../*.deb ../../../
 +