X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=4acc14f4fa3612b1377efebc8d1f79cd1df87eea;hb=70e3e1e04498c9777222142013b1793dd27a2442;hp=4b8a86d5b1a89fa65b1a4e9b44c22c7db9a2d06c;hpb=a0a34108fbab331ed25c3f1291b8fcfadec6407e;p=dcpomatic.git diff --git a/cscript b/cscript index 4b8a86d5b..4acc14f4f 100644 --- a/cscript +++ b/cscript @@ -87,6 +87,23 @@ deb_depends['7'] = {'libc6': '2.13', 'libcurl3': '7.26.0', 'libzip2': '0.10.1'} +deb_depends['8'] = {'libc6': '2.19-18', + 'libssh-4': '0.6.3-4', + 'libboost-filesystem1.55.0': '1.55.0', + 'libboost-thread1.55.0': '1.55.0', + 'libboost-date-time1.55.0': '1.55.0', + 'libsndfile1': '1.0.25-9.1', + 'libmagick++-6.q16-5': '8:6.8.9.9-5', + 'libxml++2.6-2': '2.36.0', + 'libgtk2.0-0': '2.24.25', + 'libxmlsec1': '1.2.20', + 'libxmlsec1-openssl': '1.2.20', + 'libcurl3': '7.38.0', + 'libzip2': '0.11.2', + 'libwxgtk3.0-0': '3.0.2', + 'libxcb-xfixes0': '1.10', + 'libxcb-shape0': '1.10'} + deb_depends['unstable'] = {'libc6': '2.13', 'libssh-4': '0.5.4', 'libboost-filesystem1.55.0': '1.55.0', @@ -173,10 +190,11 @@ 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}/dcpomatic/taskbar_icon.png' + print >>f,'%{_datadir}/dcpomatic2/taskbar_icon.png' + print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf' for r in ['128x128', '22x22', '32x32', '48x48', '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']: + for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU']: 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 @@ -207,8 +225,8 @@ def make_spec(filename, version, target): def dependencies(target): return (('ffmpeg-cdist', '0492ad2'), - ('libdcp', '6425742'), - ('libsub', 'f66b11f')) + ('libdcp', '1.0'), + ('libsub', '1.0')) def configure_options(target): opt = '' @@ -251,7 +269,7 @@ def package_debian(target, cpu, version): f = open('debian/files', 'w') print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu) shutil.rmtree('build/deb', ignore_errors=True) - + os.makedirs('build/deb') os.chdir('build/deb') shutil.move('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version) @@ -265,17 +283,17 @@ 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': + if target.version == '15.04' or target.version == '8': target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale') else: target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale') target.command('dpkg-buildpackage -uc -us') - + debs = [] for p in glob.glob('../*.deb'): debs.append(os.path.abspath(p)) - + return debs def package_centos(target, cpu, version): @@ -310,7 +328,7 @@ def package(target, version): elif target.platform == 'linux': if target.bits == 32: cpu = 'i386' - else: + else: cpu = 'amd64' if target.distro == 'debian' or target.distro == 'ubuntu':