Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 60700c67dae5fb3a3ab65f93b456a80335583c9b..dee81640be364e6ecbb64152d46d3889e6b276da 100644 (file)
--- a/cscript
+++ b/cscript
@@ -62,6 +62,17 @@ deb_depends['15.10'].extend(['libboost-filesystem1.58.0',
                              'libwxgtk3.0-0v5',
                              'libicu55'])
 
+deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
+                             'libboost-thread1.58.0',
+                             'libboost-regex1.58.0',
+                             'libmagick++-6.q16-5v5',
+                             'libxml++2.6-2v5',
+                             'libboost-date-time1.58.0',
+                             'libzip4',
+                             'libwxgtk3.0-0v5',
+                             'libicu55'])
+
 deb_depends['7'] = copy.deepcopy(deb_depends_base)
 deb_depends['7'].extend(['libboost-filesystem1.49.0',
                              'libboost-thread1.49.0',
@@ -217,9 +228,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options),
-            ('libdcp', 'f0a6d7b'),
-            ('libsub', 'b9fb00d'))
+    return (('ffmpeg-cdist', 'cd922b8', ffmpeg_options),
+            ('libdcp', '4e6b78d'),
+            ('libsub', 'v1.1.12'))
 
 def configure_options(target):
     opt = ''
@@ -277,7 +288,7 @@ def package_debian(target, cpu, version):
     target.set('CDIST_CONFIGURE', '"' + configure_options(target) + '"')
     if target.debug:
         target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg')
-    if target.version in ['15.04', '15.10', '8']:
+    if target.version in ['15.04', '15.10', '16.04', '8']:
         target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
     else:
         target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')