Merge master.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 9f0e3edf768513148326e6eb718ffc68ec392f74..a5c0900c121fd73a830445c3207206e3682032a9 100644 (file)
--- a/cscript
+++ b/cscript
@@ -8,7 +8,6 @@ deb_build_depends = {'debhelper': '8.0.0',
                      'pkg-config': '0.26',
                      'libssh-dev': '0.5.2',
                      'libsndfile1-dev': '1.0.25',
-                     'libmagick++-dev': '8:6.6.9.7',
                      'libgtk2.0-dev': '2.24.10'}
 
 deb_depends = dict()
@@ -157,7 +156,8 @@ def make_control(debian_version, bits, filename, debug):
 
 def dependencies(target):
     return (('ffmpeg-cdist', '2dffa11'),
-            ('libdcp', 'd5accd6'))
+            ('libdcp', '1.0'),
+            ('libsub', None))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -230,7 +230,7 @@ def package_centos(target, cpu, version):
         "%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version)
         )
 
-    target.command('rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic.spec' % topdir)
+    target.command('rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic2.spec' % topdir)
     rpms = []
 
     if cpu == "amd64":