Merge master.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index b8b0580063ee0490652cd2c8e0b0132360bcf349..adc4da639a2be9ad4e3ca8e7e093f5b9b38604ba 100644 (file)
--- a/cscript
+++ b/cscript
@@ -7,8 +7,6 @@ deb_build_depends = {'debhelper': '8.0.0',
                      'g++': '4:4.6.3',
                      'pkg-config': '0.26',
                      'libssh-dev': '0.5.2',
-                     'libboost-filesystem-dev': '1.46.0',
-                     'libboost-thread-dev': '1.46.0',
                      'libsndfile1-dev': '1.0.25',
                      'libmagick++-dev': '8:6.6.9.7',
                      'libgtk2.0-dev': '2.24.10'}
@@ -17,15 +15,15 @@ deb_depends = dict()
 
 deb_depends['12.04'] = {'libc6': '2.15',
                         'libssh-4': '0.5.2',
-                        'libboost-filesystem1.46.1': '1.46.1',
-                        'libboost-thread1.46.1': '1.46.1',
+                        'libboost-filesystem1.48.0': '1.48.0-3',
+                        'libboost-thread1.48.0': '1.48.0-3',
                         'libsndfile1': '1.0.25',
                         'libmagick++4': '8:6.6.9.7',
                         'libxml++2.6-2': '2.34.1',
                         'libgtk2.0-0': '2.24.10',
                         'libxmlsec1': '1.2.14-1.2build1',
                         'libxmlsec1-openssl': '1.2.14-1.2build1',
-                        'libboost-date-time1.46.1': '1.46.1',
+                        'libboost-date-time1.48.0': '1.48.0-3',
                         'libcurl3': '7.22.0-3ubuntu4',
                         'libzip2': '0.10-1ubuntu1'}
 
@@ -71,6 +69,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,7 +141,7 @@ def make_control(debian_version, bits, filename, debug):
         print >>f,''
 
 def dependencies(target):
-    return (('ffmpeg-cdist', '08827fa4e1d483511e6135c424d2ca9c56a9ed50'),
+    return (('ffmpeg-cdist', 'bba68a5'),
             ('libdcp', '1.0'))
 
 def build(target, options):