X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=3b179795dd0c47c16ceef832fd3bc27d563e0e85;hb=aedaebb9a265128110085d3ca0ad5604409f0ddb;hp=16af8bdbe20a923f9591db1224f4936687e461fc;hpb=bcd02c31759cd9948016d28f8f339259d778cc63;p=dcpomatic.git

diff --git a/cscript b/cscript
index 16af8bdbe..3b179795d 100644
--- a/cscript
+++ b/cscript
@@ -63,6 +63,8 @@ deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
                         'libcurl3': '7.35.0-1ubuntu2',
                         'libzip2': '0.10.1-1.2',
                         'libsamplerate0': '0.1.8-7',
+                        'libcairomm-1.0-1': '1.10.0-1ubuntu3',
+                        'libpangomm-1.4-1': '2.34.0-1ubuntu1',
                         'libicu52': '52.1-3'}
 
 deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
@@ -207,15 +209,22 @@ def make_spec(filename, version, target):
     print >>f,'%{_bindir}/dcpomatic2_kdm'
     print >>f,'%{_bindir}/dcpomatic2_server'
     print >>f,'%{_bindir}/dcpomatic2_server_cli'
+    print >>f,'%{_bindir}/dcpomatic2_kdm_cli'
     print >>f,'%{_datadir}/applications/dcpomatic2.desktop'
     print >>f,'%{_datadir}/applications/dcpomatic2_batch.desktop'
     print >>f,'%{_datadir}/applications/dcpomatic2_server.desktop'
-    print >>f,'%{_datadir}/dcpomatic2/taskbar_icon.png'
+    print >>f,'%{_datadir}/applications/dcpomatic2_kdm.desktop'
+    print >>f,'%{_datadir}/dcpomatic2/dcpomatic2_server_small.png'
     print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf'
+    print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf'
+    print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf'
     print >>f,'%{_datadir}/dcpomatic2/splash.png'
-    for r in ['128x128', '22x22', '32x32', '48x48', '64x64']:
+    for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']:
         print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r
-    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK']:
+        print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r
+        print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r
+        print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r
+    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT']:
         print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l
         print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l
         print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l
@@ -252,8 +261,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options),
-            ('libdcp', '4debca2'),
-            ('libsub', '5f04dd1'))
+            ('libdcp', 'v1.2.8'),
+            ('libsub', 'v1.1.8'))
 
 def configure_options(target):
     opt = ''
@@ -269,8 +278,6 @@ def configure_options(target):
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
                 opt += ' --workaround-gssapi --static-xmlpp'
-        if target.distro == 'debian' and target.version == 'unstable':
-            target.append_with_space('CXXFLAGS', '-std=c++11')
 
     return opt