Fix name of taskbar icon for RPMs.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 16af8bdbe20a923f9591db1224f4936687e461fc..652af77a16c7a8e0d3db3a1458876722d2d02189 100644 (file)
--- a/cscript
+++ b/cscript
@@ -210,7 +210,7 @@ def make_spec(filename, version, target):
     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}/dcpomatic2/dcpomatic2_server_small.png'
     print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf'
     print >>f,'%{_datadir}/dcpomatic2/splash.png'
     for r in ['128x128', '22x22', '32x32', '48x48', '64x64']:
@@ -252,8 +252,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options),
-            ('libdcp', '4debca2'),
-            ('libsub', '5f04dd1'))
+            ('libdcp', '1f18188'),
+            ('libsub', 'b92c8d3'))
 
 def configure_options(target):
     opt = ''
@@ -269,8 +269,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