From 72eedf0b240c71b9dbd27d1f95b109b48e3200a2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 Nov 2013 22:23:15 +0000 Subject: A whole load of UTF-8/-16 confusion fixes for Windows. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 125a4d34c..3830cdc81 100644 --- a/cscript +++ b/cscript @@ -4,7 +4,7 @@ import os def dependencies(target): return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'), - ('libdcp', 'f38137b21051ce770bbb4d829ae9d6229e97508f')) + ('libdcp', 'd0b7892cbab3618fca85a4c95d70d8a1c26a5c4d')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From 012351428ea81caa78baa28167c0f4a734bed689 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 27 Nov 2013 09:57:45 +0000 Subject: Bump libdcp. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 3830cdc81..f6b18881e 100644 --- a/cscript +++ b/cscript @@ -4,7 +4,7 @@ import os def dependencies(target): return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'), - ('libdcp', 'd0b7892cbab3618fca85a4c95d70d8a1c26a5c4d')) + ('libdcp', 'a86a53096f632f63afc6130c23291c28acb9686a')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From 15b8cca90c9135bf49bdfce08ebd10b92e5a4d0b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 27 Nov 2013 14:57:05 +0000 Subject: Update libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index f6b18881e..9298b47fc 100644 --- a/cscript +++ b/cscript @@ -4,7 +4,7 @@ import os def dependencies(target): return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'), - ('libdcp', 'a86a53096f632f63afc6130c23291c28acb9686a')) + ('libdcp', 'v0.84')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/wscript b/wscript index a1ed6ec23..87999f7de 100644 --- a/wscript +++ b/wscript @@ -88,7 +88,7 @@ def configure(conf): # Dependencies which are dynamically linked everywhere except --static # Get libs only when we are dynamically linking - conf.check_cfg(package='libdcp', atleast_version='0.83', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.84', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.check_cfg(package='libcxml', atleast_version='0.08', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True) -- cgit v1.2.3 From 60b532743f84fd29f87de75edcbd7872cb640f6e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 27 Nov 2013 15:23:06 +0000 Subject: Bump libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 9298b47fc..a1cee78f2 100644 --- a/cscript +++ b/cscript @@ -4,7 +4,7 @@ import os def dependencies(target): return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'), - ('libdcp', 'v0.84')) + ('libdcp', 'v0.85')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/wscript b/wscript index 87999f7de..029bedf1e 100644 --- a/wscript +++ b/wscript @@ -88,7 +88,7 @@ def configure(conf): # Dependencies which are dynamically linked everywhere except --static # Get libs only when we are dynamically linking - conf.check_cfg(package='libdcp', atleast_version='0.84', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.85', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.check_cfg(package='libcxml', atleast_version='0.08', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True) -- cgit v1.2.3 From e5c8e698dd7b4db9ac69549228b3ebc845ef165b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 28 Nov 2013 11:03:26 +0000 Subject: First attempt at scripting generation of control files for Linux builds. --- cscript | 126 +++++++++++++++++++++++++++++++++++++++- platform/linux/control-12.04-32 | 24 -------- platform/linux/control-12.04-64 | 24 -------- platform/linux/control-12.10-32 | 23 -------- platform/linux/control-12.10-64 | 24 -------- platform/linux/control-13.04-32 | 23 -------- platform/linux/control-13.04-64 | 24 -------- platform/linux/control-13.10-32 | 23 -------- platform/linux/control-13.10-64 | 23 -------- platform/linux/control-7-32 | 24 -------- platform/linux/control-7-64 | 24 -------- 11 files changed, 124 insertions(+), 238 deletions(-) delete mode 100644 platform/linux/control-12.04-32 delete mode 100644 platform/linux/control-12.04-64 delete mode 100644 platform/linux/control-12.10-32 delete mode 100644 platform/linux/control-12.10-64 delete mode 100644 platform/linux/control-13.04-32 delete mode 100644 platform/linux/control-13.04-64 delete mode 100644 platform/linux/control-13.10-32 delete mode 100644 platform/linux/control-13.10-64 delete mode 100644 platform/linux/control-7-32 delete mode 100644 platform/linux/control-7-64 (limited to 'cscript') diff --git a/cscript b/cscript index a1cee78f2..76dd8c60d 100644 --- a/cscript +++ b/cscript @@ -2,6 +2,129 @@ import glob import shutil import os +build_depends = {'debhelper': '8.0.0', + 'python': '2.7.3', + 'g++': '4:4.6.3', + 'pkg-config': '0.26', + 'libssh-dev': '0.5.2', + 'libboost-filesystem-dev': '1.46.0', + 'libboost-thread-dev': '1.46.0', + 'libsndfile1-dev': '1.0.25', + 'libmagick++-dev': '8:6.6.9.7', + 'libgtk2.0-dev': '2.24.10'} + +depends = dict() + +depends['12.04'] = {'libc6': '2.15', + 'libssh-4', '0.5.2', + 'libboost-filesystem1.46.1', '1.46.1', + 'libboost-thread1.46.1', '1.46.1', + 'libsndfile1', '1.0.25', + 'libmagick++4', '8:6.6.9.7', + 'libxml++2.6-2', '2.34.1', + 'libgtk2.0-0', '2.24.10', + 'libxmlsec1', '1.2.14-1.2build1', + 'libxmlsec1-openssl', '1.2.14-1.2build1', + 'libboost-date-time1.46.1', '1.46.1', + 'libcurl3', '7.22.0-3ubuntu4', + 'libzip2', '0.10-1ubuntu1'} + +depends['12.10'] = {'libc6': '2.15', + 'libssh-4': '0.5.2', + 'libboost-filesystem1.49.0', '1.49.0', + 'libboost-thread1.49.0', '1.49.0', + 'libsndfile1': '1.0.25', + 'libmagick++5': '8:6.7.7.10', + 'libxml++2.6-2': '2.34.2', + 'libgtk2.0-0': '2.24.13', + 'libxmlsec1': '1.2.18-2', + 'libboost-date-time1.49.0': '1.49.0', + 'libcurl3': '7.27.0-1ubuntu1', + 'libzip2': '0.10.1-1.1'} + +depends['13.04'] = {'libc6': '2.15', + 'libssh-4': '0.5.2', + 'libboost-filesystem1.49.0': '1.49.0', + 'libboost-thread1.49.0': '1.49.0', + 'libsndfile1': '1.0.25', + 'libmagick++5': '8:6.7.7.10', + 'libxml++2.6-2': '2.34.2', + 'libgtk2.0-0': '2.24.13', + 'libxmlsec1': '1.2.18-2', + 'libxmlsec1-openssl': '1.2.14-1.2build1', + 'libboost-date-time1.49.0': '1.49.0', + 'libcurl3': '7.29.0-1ubuntu3', + 'libzip2': '0.10.1-1.1'} + +depends['13.10'] = {'libc6': '2.17-93', + 'libssh-4': '0.5.4', + 'libboost-filesystem1.53.0': '1.53.0', + 'libboost-thread1.53.0': '1.53.0', + 'libsndfile1': '1.0.25', + 'libmagick++5': '8:6.7.7.10', + 'libxml++2.6-2': '2.36.0', + 'libgtk2.0-0': '2.24.20', + 'libxmlsec1': '1.2.18-2', + 'libxmlsec1-openssl': '1.2.14-1.2build1', + 'libboost-date-time1.49.0': '1.49.0', + 'libcurl3': '7.29.0-1ubuntu3', + 'libzip2': '0.10.1-1.1'} + +depends['7'] = {'libc6': '2.13', + 'libssh-4': '0.5.4', + 'libboost-filesystem1.49.0': '1.49.0', + 'libboost-thread1.49.0': '1.49.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.49.0': '1.49.0', + 'libxmlsec1-openssl': '1.2.18', + 'libcurl3': '7.26.0', + 'libzip2': '0.10.1'} + +def packages(name, packages, f): + s = '%s: ' % name + for p in packages: + s += str(p) + ', ' + print >>f,s[:-2] + +def make_control(version, bits, filename): + f = open(filename, 'w') + print >>f,'Source: dcpomatic' + print >>f,'Section: video' + print >>f,'Priority: extra' + print >>f,'Maintainer: Carl Hetherington ' + packages('Build-Depends', build_depends, f) + print >>f,'Standards-Version: 3.9.3' + print >>f,'Homepage: http://dcpomatic.com/' + print >>f,'' + print >>f,'Package: dcpomatic' + if bits == 32: + print >>f,'Architecture: i386' + else: + print >>f,'Architecture: amd64' + + packages('Depends', depends[version], f) + print >>f,'Description: Generator of Digital Cinema Packages (DCPs)' + print >>f,' DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio' + print >>f,' files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant' + print >>f,' digital projectors.' + + print >>f,'' + print >>f,'Package: dcpomatic-dbg' + if bits == 32: + print >>f,'Architecture: i386' + else: + print >>f,'Architecture: amd64' + print >>f,'Section: debug' + print >>f,'Priority: extra' + print >>f,'Depends: ${dcpomatic:Depends}, ${misc:Depends}' + print >>f,'Description: debugging symbols for dcpomatic' + print >>f,' This package contains the debugging symbols for dcpomatic.' + print >>f,'' + def dependencies(target): return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'), ('libdcp', 'v0.85')) @@ -19,7 +142,6 @@ def build(target): if target.platform == 'linux' or target.platform == 'osx': target.command('./waf install') - def package(target, version): if target.platform == 'windows': shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits) @@ -36,7 +158,7 @@ def package(target, version): else: cpu = 'amd64' - shutil.copyfile('platform/linux/control-%s-%d' % (target.version, target.bits), 'debian/control') + make_control(target.version, target.bits, 'debian/control') target.command('./waf dist') f = open('debian/files', 'w') print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu) diff --git a/platform/linux/control-12.04-32 b/platform/linux/control-12.04-32 deleted file mode 100644 index d50bf2469..000000000 --- a/platform/linux/control-12.04-32 +++ /dev/null @@ -1,24 +0,0 @@ -Source: dcpomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7), libgtk2.0-dev (>= 2.24.10) -Standards-Version: 3.9.3 -Homepage: http://dcpomatic.com/ - -Package: dcpomatic -Architecture: i386 -Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1), libgtk2.0-0 (>= 2.24.10), libxmlsec1 (>= 1.2.14-1.2build1), libxmlsec1-openssl (>= 1.2.14-1.2build1), libboost-date-time1.46.1 (>= 1.46.1), libcurl3 (>= 7.22.0-3ubuntu4), libzip2 (>= 0.10-1ubuntu1) -Description: Generator of Digital Cinema Packages (DCPs) - DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dcpomatic-dbg -Architecture: i386 -Section: debug -Priority: extra -Depends: ${dcpomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dcpomatic - This package contains the debugging symbols for dcpomatic. - diff --git a/platform/linux/control-12.04-64 b/platform/linux/control-12.04-64 deleted file mode 100644 index c1f8674ae..000000000 --- a/platform/linux/control-12.04-64 +++ /dev/null @@ -1,24 +0,0 @@ -Source: dcpomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7), libgtk2.0-dev (>= 2.4.10) -Standards-Version: 3.9.3 -Homepage: http://dcpomatic.com/ - -Package: dcpomatic -Architecture: amd64 -Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1), libxmlsec1 (>= 1.2.14-1.2build1), libxmlsec1-openssl (>= 1.2.14-1.2build1), libboost-date-time1.46.1 (>= 1.46.1), libcurl3 (>= 7.22.0-3ubuntu4), libzip2 (>= 0.10-1ubuntu1) -Description: Generator of Digital Cinema Packages (DCPs) - DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dcpomatic-dbg -Architecture: amd64 -Section: debug -Priority: extra -Depends: ${dcpomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dcpomatic - This package contains the debugging symbols for dcpomatic. - diff --git a/platform/linux/control-12.10-32 b/platform/linux/control-12.10-32 deleted file mode 100644 index 3f24eace7..000000000 --- a/platform/linux/control-12.10-32 +++ /dev/null @@ -1,23 +0,0 @@ -Source: dcpomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7), libgtk2.0-dev (>= 2.24.13) -Standards-Version: 3.9.3 -Homepage: http://dcpomatic.com/ - -Package: dcpomatic -Architecture: i386 -Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2), libgtk2.0-0 (>= 2.24.13), libxmlsec1 (>= 1.2.18-2), libboost-date-time1.49.0 (>= 1.49.0), libcurl3 (>= 7.27.0-1ubuntu1), libzip2 (>= 0.10.1-1.1) -Description: Generator of Digital Cinema Packages (DCPs) - DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dcpomatic-dbg -Architecture: i386 -Section: debug -Priority: extra -Depends: ${dcpomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dcpomatic - This package contains the debugging symbols for dcpomatic. diff --git a/platform/linux/control-12.10-64 b/platform/linux/control-12.10-64 deleted file mode 100644 index a00292e46..000000000 --- a/platform/linux/control-12.10-64 +++ /dev/null @@ -1,24 +0,0 @@ -Source: dcpomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7), libgtk2.0-dev (>= 2.24.13) -Standards-Version: 3.9.3 -Homepage: http://dcpomatic.com/ - -Package: dcpomatic -Architecture: amd64 -Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2), libgtk2.0-0 (>= 2.24.13), libxmlsec1 (>= 1.2.18-2), libboost-date-time1.49.0 (>= 1.49.0), libcurl3 (>= 7.27.0-1ubuntu1), libzip2 (>= 0.10.1-1.1) -Description: Generator of Digital Cinema Packages (DCPs) - DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dcpomatic-dbg -Architecture: amd64 -Section: debug -Priority: extra -Depends: ${dcpomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dcpomatic - This package contains the debugging symbols for dcpomatic. - diff --git a/platform/linux/control-13.04-32 b/platform/linux/control-13.04-32 deleted file mode 100644 index caa45b073..000000000 --- a/platform/linux/control-13.04-32 +++ /dev/null @@ -1,23 +0,0 @@ -Source: dcpomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7), libgtk2.0-dev (>= 2.24.13) -Standards-Version: 3.9.3 -Homepage: http://dcpomatic.com/ - -Package: dcpomatic -Architecture: i386 -Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2), libgtk2.0-0 (>= 2.24.13), libxmlsec1 (>= 1.2.18-2), libboost-date-time1.49.0 (>= 1.49.0), libcurl3 (>= 7.29.0-1ubuntu3), libzip2 (>= 0.10.1-1.1) -Description: Generator of Digital Cinema Packages (DCPs) - DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dcpomatic-dbg -Architecture: i386 -Section: debug -Priority: extra -Depends: ${dcpomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dcpomatic - This package contains the debugging symbols for dcpomatic. diff --git a/platform/linux/control-13.04-64 b/platform/linux/control-13.04-64 deleted file mode 100644 index 84957c00a..000000000 --- a/platform/linux/control-13.04-64 +++ /dev/null @@ -1,24 +0,0 @@ -Source: dcpomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7), libgtk2.0-dev (>= 2.24.13) -Standards-Version: 3.9.3 -Homepage: http://dcpomatic.com/ - -Package: dcpomatic -Architecture: amd64 -Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2), libgtk2.0-0 (>= 2.24.13), libxmlsec1 (>= 1.2.18-2), libboost-date-time1.49.0 (>= 1.49.0), libcurl3 (>= 7.29.0-1ubuntu3), libzip2 (>= 0.10.1-1.1) -Description: Generator of Digital Cinema Packages (DCPs) - DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dcpomatic-dbg -Architecture: amd64 -Section: debug -Priority: extra -Depends: ${dcpomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dcpomatic - This package contains the debugging symbols for dcpomatic. - diff --git a/platform/linux/control-13.10-32 b/platform/linux/control-13.10-32 deleted file mode 100644 index 420469c85..000000000 --- a/platform/linux/control-13.10-32 +++ /dev/null @@ -1,23 +0,0 @@ -Source: dcpomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 9.2.0), python (>= 2.7.5), g++ (>= 4:4.8.1), pkg-config (>= 0.26), libssh-dev (>= 0.5.4), libboost-filesystem-dev (>= 1.53.0), libboost-thread-dev (>= 1.53.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.7.7.10), libgtk2.0-dev (>= 2.24.20) -Standards-Version: 3.9.3 -Homepage: http://dcpomatic.com/ - -Package: dcpomatic -Architecture: i386 -Depends: libc6 (>= 2.17-93), libssh-4 (>= 0.5.4), libboost-filesystem1.53.0 (>= 1.53.0), libboost-thread1.53.0 (>= 1.53.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.36.0), libgtk2.0-0 (>= 2.24.20), libxmlsec1 (>= 1.2.18-2), libboost-date-time1.53.0 (>= 1.53.0), libcurl3 (>= 7.32.0-1ubuntu1), libzip2 (>= 0.10.1-1.1) -Description: Generator of Digital Cinema Packages (DCPs) - DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dcpomatic-dbg -Architecture: i386 -Section: debug -Priority: extra -Depends: ${dcpomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dcpomatic - This package contains the debugging symbols for dcpomatic. diff --git a/platform/linux/control-13.10-64 b/platform/linux/control-13.10-64 deleted file mode 100644 index 39b367241..000000000 --- a/platform/linux/control-13.10-64 +++ /dev/null @@ -1,23 +0,0 @@ -Source: dcpomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 9.2.0), python (>= 2.7.5), g++ (>= 4:4.8.1), pkg-config (>= 0.26), libssh-dev (>= 0.5.4), libboost-filesystem-dev (>= 1.53.0), libboost-thread-dev (>= 1.53.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.7.7.10), libgtk2.0-dev (>= 2.24.20) -Standards-Version: 3.9.3 -Homepage: http://dcpomatic.com/ - -Package: dcpomatic -Architecture: amd64 -Depends: libc6 (>= 2.17-93), libssh-4 (>= 0.5.4), libboost-filesystem1.53.0 (>= 1.53.0), libboost-thread1.53.0 (>= 1.53.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.36.0), libgtk2.0-0 (>= 2.24.20), libxmlsec1 (>= 1.2.18-2), libboost-date-time1.53.0 (>= 1.53.0), libcurl3 (>= 7.32.0-1ubuntu1), libzip2 (>= 0.10.1-1.1) -Description: Generator of Digital Cinema Packages (DCPs) - DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dcpomatic-dbg -Architecture: amd64 -Section: debug -Priority: extra -Depends: ${dcpomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dcpomatic - This package contains the debugging symbols for dcpomatic. diff --git a/platform/linux/control-7-32 b/platform/linux/control-7-32 deleted file mode 100644 index fda3d504b..000000000 --- a/platform/linux/control-7-32 +++ /dev/null @@ -1,24 +0,0 @@ -Source: dcpomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.7.2), pkg-config (>= 0.26), libssh-dev (>= 0.5.4), libboost-filesystem-dev (>= 1.49.0), libboost-thread-dev (>= 1.49.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.7.7.10), libgtk2.0-dev (>= 2.24.10) -Standards-Version: 3.9.3 -Homepage: http://dcpomatic.com/ - -Package: dcpomatic -Architecture: i386 -Depends: libc6 (>= 2.13), libssh-4 (>= 0.5.4), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.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.49.0 (>= 1.49.0), libxmlsec1-openssl (>= 1.2.18), libcurl3 (>= 7.26.0), libzip2 (>= 0.10.1) -Description: Generator of Digital Cinema Packages (DCPs) - DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dcpomatic-dbg -Architecture: i386 -Section: debug -Priority: extra -Depends: ${dcpomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dcpomatic - This package contains the debugging symbols for dcpomatic. - diff --git a/platform/linux/control-7-64 b/platform/linux/control-7-64 deleted file mode 100644 index 72c89f4eb..000000000 --- a/platform/linux/control-7-64 +++ /dev/null @@ -1,24 +0,0 @@ -Source: dcpomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.7.2), pkg-config (>= 0.26), libssh-dev (>= 0.5.4), libboost-filesystem-dev (>= 1.49.0), libboost-thread-dev (>= 1.49.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.7.7.10), libgtk2.0-dev (>= 2.24.10) -Standards-Version: 3.9.3 -Homepage: http://dcpomatic.com/ - -Package: dcpomatic -Architecture: amd64 -Depends: libc6 (>= 2.13), libssh-4 (>= 0.5.4), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.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.49.0 (>= 1.49.0), libxmlsec1-openssl (>= 1.2.18), libcurl3 (>= 7.26.0), libzip2 (>= 0.10.1) -Description: Generator of Digital Cinema Packages (DCPs) - DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dcpomatic-dbg -Architecture: amd64 -Section: debug -Priority: extra -Depends: ${dcpomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dcpomatic - This package contains the debugging symbols for dcpomatic. - -- cgit v1.2.3 From d8e545ab04e00d2ead9e7be588b9fc089282ac4a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 28 Nov 2013 11:04:45 +0000 Subject: Typo. --- cscript | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 76dd8c60d..46ced3c24 100644 --- a/cscript +++ b/cscript @@ -16,18 +16,18 @@ build_depends = {'debhelper': '8.0.0', depends = dict() depends['12.04'] = {'libc6': '2.15', - 'libssh-4', '0.5.2', - 'libboost-filesystem1.46.1', '1.46.1', - 'libboost-thread1.46.1', '1.46.1', - 'libsndfile1', '1.0.25', - 'libmagick++4', '8:6.6.9.7', - 'libxml++2.6-2', '2.34.1', - 'libgtk2.0-0', '2.24.10', - 'libxmlsec1', '1.2.14-1.2build1', - 'libxmlsec1-openssl', '1.2.14-1.2build1', - 'libboost-date-time1.46.1', '1.46.1', - 'libcurl3', '7.22.0-3ubuntu4', - 'libzip2', '0.10-1ubuntu1'} + 'libssh-4': '0.5.2', + 'libboost-filesystem1.46.1': '1.46.1', + 'libboost-thread1.46.1': '1.46.1', + 'libsndfile1': '1.0.25', + 'libmagick++4': '8:6.6.9.7', + 'libxml++2.6-2': '2.34.1', + 'libgtk2.0-0': '2.24.10', + 'libxmlsec1': '1.2.14-1.2build1', + 'libxmlsec1-openssl': '1.2.14-1.2build1', + 'libboost-date-time1.46.1': '1.46.1', + 'libcurl3': '7.22.0-3ubuntu4', + 'libzip2': '0.10-1ubuntu1'} depends['12.10'] = {'libc6': '2.15', 'libssh-4': '0.5.2', -- cgit v1.2.3 From 58431f2de00bd5a68e474f39d987a7f7bf10340f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 28 Nov 2013 11:05:07 +0000 Subject: Typo. --- cscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 46ced3c24..ba99f5557 100644 --- a/cscript +++ b/cscript @@ -31,8 +31,8 @@ depends['12.04'] = {'libc6': '2.15', depends['12.10'] = {'libc6': '2.15', 'libssh-4': '0.5.2', - 'libboost-filesystem1.49.0', '1.49.0', - 'libboost-thread1.49.0', '1.49.0', + 'libboost-filesystem1.49.0': '1.49.0', + 'libboost-thread1.49.0': '1.49.0', 'libsndfile1': '1.0.25', 'libmagick++5': '8:6.7.7.10', 'libxml++2.6-2': '2.34.2', -- cgit v1.2.3 From 9ef3353e2fd1eb7e751e58b36c40b8d8da5209fa Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 28 Nov 2013 12:22:32 +0000 Subject: Don't bother building debug packages. --- cscript | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index ba99f5557..21717d843 100644 --- a/cscript +++ b/cscript @@ -112,19 +112,6 @@ def make_control(version, bits, filename): print >>f,' files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant' print >>f,' digital projectors.' - print >>f,'' - print >>f,'Package: dcpomatic-dbg' - if bits == 32: - print >>f,'Architecture: i386' - else: - print >>f,'Architecture: amd64' - print >>f,'Section: debug' - print >>f,'Priority: extra' - print >>f,'Depends: ${dcpomatic:Depends}, ${misc:Depends}' - print >>f,'Description: debugging symbols for dcpomatic' - print >>f,' This package contains the debugging symbols for dcpomatic.' - print >>f,'' - def dependencies(target): return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'), ('libdcp', 'v0.85')) -- cgit v1.2.3 From b8e619c375029058429e1984839d4ae1b5ad9fed Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 28 Nov 2013 12:58:36 +0000 Subject: Tweak libxmlsec1-openssl deps. --- cscript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 21717d843..b7f2d191b 100644 --- a/cscript +++ b/cscript @@ -38,6 +38,7 @@ depends['12.10'] = {'libc6': '2.15', 'libxml++2.6-2': '2.34.2', 'libgtk2.0-0': '2.24.13', 'libxmlsec1': '1.2.18-2', + 'libxmlsec1-openssl': '1.2.18-2', 'libboost-date-time1.49.0': '1.49.0', 'libcurl3': '7.27.0-1ubuntu1', 'libzip2': '0.10.1-1.1'} @@ -51,7 +52,7 @@ depends['13.04'] = {'libc6': '2.15', 'libxml++2.6-2': '2.34.2', 'libgtk2.0-0': '2.24.13', 'libxmlsec1': '1.2.18-2', - 'libxmlsec1-openssl': '1.2.14-1.2build1', + 'libxmlsec1-openssl': '1.2.18-2', 'libboost-date-time1.49.0': '1.49.0', 'libcurl3': '7.29.0-1ubuntu3', 'libzip2': '0.10.1-1.1'} @@ -65,7 +66,7 @@ depends['13.10'] = {'libc6': '2.17-93', 'libxml++2.6-2': '2.36.0', 'libgtk2.0-0': '2.24.20', 'libxmlsec1': '1.2.18-2', - 'libxmlsec1-openssl': '1.2.14-1.2build1', + 'libxmlsec1-openssl': '1.2.18-2', 'libboost-date-time1.49.0': '1.49.0', 'libcurl3': '7.29.0-1ubuntu3', 'libzip2': '0.10.1-1.1'} -- cgit v1.2.3