Merge master.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 90cbbecfbc6c309cfa3ca145d064bfb106e4cab3..795cf0a35000f85b6ec96a220d4fa7455b97c203 100644 (file)
--- a/cscript
+++ b/cscript
@@ -156,8 +156,9 @@ def make_control(debian_version, bits, filename, debug):
         print >>f,''
 
 def dependencies(target):
-    return (('ffmpeg-cdist', '7e95caa'),
-            ('libdcp', '1.0'))
+    return (('ffmpeg-cdist', '2dffa11'),
+            ('libdcp', '1.0'),
+            ('libsub', None))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -208,7 +209,7 @@ def package_debian(target, cpu, version):
     target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH'))
     if target.version == 'unstable':
         target.set('CDIST_EXTRA_CONFIGURE', '--debian-unstable')
-    target.command('dpkg-buildpackage')
+    target.command('dpkg-buildpackage -uc -us')
     
     debs = []
     for p in glob.glob('../*.deb'):