Merge master.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index e6738250ccd9751865ed9124e012568b865b4f7e..e1a987fdec0f73b13aa222b682ee0178d0ad5412 100644 (file)
--- a/cscript
+++ b/cscript
@@ -71,6 +71,20 @@ deb_depends['13.10'] = {'libc6': '2.17-93',
                         'libcurl3': '7.29.0-1ubuntu3',
                         'libzip2': '0.10.1-1.1'}
 
+deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
+                        'libssh-4': '0.6.1-0ubuntu3',
+                        'libboost-filesystem1.54.0': '1.54.0-4ubuntu3',
+                        'libboost-thread1.54.0': '1.54.0-4ubuntu3',
+                        'libsndfile1': '1.0.25-7ubuntu2',
+                        'libmagick++5': '8:6.7.7.10-6ubuntu3',
+                        'libxml++2.6-2': '2.36.0-2ubuntu1',
+                        'libgtk2.0-0': '2.24.23-0ubuntu1',
+                        'libxmlsec1': '1.2.18-2ubuntu1',
+                        'libxmlsec1-openssl': '1.2.18-2ubuntu1',
+                        'libboost-date-time1.54.0': '1.54.0-4ubuntu3',
+                        'libcurl3': '7.35.0-1ubuntu2',
+                        'libzip2': '0.10.1-1.2'}
+
 deb_depends['7'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
                     'libboost-filesystem1.49.0': '1.49.0',
@@ -129,8 +143,8 @@ def make_control(debian_version, bits, filename, debug):
         print >>f,''
 
 def dependencies(target):
-    return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'),
-            ('libdcp', 'a6bc997'))
+    return (('ffmpeg-cdist', 'bba68a5'),
+            ('libdcp', '1.0'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()