Merge master.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index f699e8089bd4ad04c9ace41c03be5b3b146f6756..0c27e59fedae3b70601061eca359d0f7d499acb0 100644 (file)
--- a/cscript
+++ b/cscript
@@ -157,7 +157,7 @@ def make_control(debian_version, bits, filename, debug):
 
 def dependencies(target):
     return (('ffmpeg-cdist', '67dc770'),
-            ('libdcp', 'v0.95.0'))
+            ('libdcp', '1.0'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
@@ -166,12 +166,11 @@ def build(target, options):
     elif target.platform == 'linux':
         if target.distro == 'debian' or target.distro == 'ubuntu':
             cmd += ' --target-debian'
+            if target.version == 'unstable':
+                cmd += ' --debian-unstable'
         elif target.distro == 'centos':
             cmd += ' --target-centos'
 
-    if target.distro == 'debian' and target.version == 'unstable':
-        cmd += ' --debian-unstable'
-
     target.command(cmd)
     target.command('./waf')