X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=33669f95cef50bf9c9c4b79f77f5c219cc11364d;hb=69f25e496ba409c02aa27b1e07dfcde34c86a32b;hp=acd33b38cd4d370d8853675f3fbe7fc9072829de;hpb=276a8f49c94cc80a7b29d5ecd8c7584e7ddcd87c;p=dcpomatic.git diff --git a/cscript b/cscript index acd33b38c..33669f95c 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', @@ -83,6 +85,24 @@ deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4', 'libsamplerate0': '0.1.8-8', 'libicu52': '52.1-8'} +deb_depends['15.10'] = {'libc6': '2.21-0ubuntu4', + 'libssh-4': '0.6.3-3ubuntu3', + 'libboost-filesystem1.58.0': '1.58.0+dfsg-3.1ubuntu1', + 'libboost-thread1.58.0': '1.58.0+dfsg-3.1ubuntu1', + 'libboost-regex1.58.0': '1.58.0+dfsg-3.1ubuntu1', + 'libsndfile1': '1.0.25-9.1', + 'libmagick++-6.q16-5v5': '8:6.8.9.9-5ubuntu2', + 'libxml++2.6-2v5': '2.38.1-2', + 'libgtk2.0-0': '2.24.28-1ubuntu1', + 'libxmlsec1': '1.2.20-2ubuntu3', + 'libxmlsec1-openssl': '1.2.20-2ubuntu3', + 'libboost-date-time1.58.0': '1.58.0+dfsg-3.1ubuntu1', + 'libcurl3': '7.43.0-1ubuntu2', + 'libzip4': '1.0.1-0ubuntu1', + 'libwxgtk3.0-0v5': '3.0.2+dfsg-1.2', + 'libsamplerate0': '0.1.8-8', + 'libicu55': '55.1-4ubuntu1'} + deb_depends['7'] = {'libc6': '2.13', 'libssh-4': '0.5.4', 'libboost-filesystem1.49.0': '1.49.0', @@ -122,22 +142,22 @@ deb_depends['8'] = {'libc6': '2.19-18', 'libsamplerate0': '0.1.8-8', 'libicu52': '52.1-8+deb8u2'} -deb_depends['unstable'] = {'libc6': '2.13', - 'libssh-4': '0.5.4', - 'libboost-filesystem1.55.0': '1.55.0', - 'libboost-thread1.55.0': '1.55.0', - 'libboost-regex1.55.0': '1.55.0', - 'libsndfile1': '1.0.25', - 'libmagick++5': '8:6.7.7.10', - 'libxml++2.6-2': '2.34.2', - 'libgtk2.0-0': '2.24.10', - 'libxmlsec1': '1.2.18', - 'libboost-date-time1.55.0': '1.55.0', - 'libxmlsec1-openssl': '1.2.18', - 'libcurl3': '7.26.0', - 'libzip2': '0.10.1', - 'libsamplerate0': '0.1.8-8', - 'libicu52': '52.1-9'} +deb_depends['unstable'] = {'libc6': '2.19-22', + 'libssh-4': '0.6.3-4.1+b1', + 'libboost-filesystem1.58.0': '1.58.0+dfsg-4', + 'libboost-thread1.58.0': '1.58.0+dfsg-4', + 'libboost-regex1.58.0': '1.58.0+dfsg-4', + 'libsndfile1': '1.0.25-9.1', + 'libmagick++-6.q16-5v5': '8:6.8.9.9-6', + 'libxml++2.6-2v5': '2.40.1-1', + 'libgtk2.0-0': '2.24.28-1', + 'libxmlsec1': '1.2.20-2+b2', + 'libboost-date-time1.58.0': '1.58.0+dfsg-4', + 'libxmlsec1-openssl': '1.2.20-2+b2', + 'libcurl3': '7.45.0-1+b1', + 'libzip2': '0.11.2-1.2', + 'libsamplerate0': '0.1.8-8', + 'libicu52': '52.1-10'} def packages(name, packages, f): s = '%s: ' % name @@ -207,15 +227,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 +279,8 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options), - ('libdcp', '3c7d752'), - ('libsub', '3ed0ae0')) + ('libdcp', '332c7c3'), + ('libsub', '8182aed')) def configure_options(target): opt = '' @@ -269,8 +296,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 @@ -313,7 +338,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 == '15.04' or target.version == '8': + if target.version in ['15.04', '15.10', '8']: target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale') else: target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')