diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-18 20:48:34 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-18 20:48:34 +0000 |
| commit | de68adffc0311511568484e9ab713bee8826ec2d (patch) | |
| tree | 05c7e4fc260653a2e5f4c3e5e1bd7c3c823ffb95 | |
| parent | ad10aea1d685e67e0e639f6303fc9c8f8f1f945c (diff) | |
| parent | f53ef1bb81f5afd81f95bd187f4cd90bbbd3cd7d (diff) | |
Merge branch '1.0' into 1.0-seek
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | wscript | 4 |
4 files changed, 12 insertions, 5 deletions
@@ -1,5 +1,11 @@ 2013-12-18 Carl Hetherington <cth@carlh.net> + * Version 1.44 released. + +2013-12-18 Carl Hetherington <cth@carlh.net> + + * Bump libdcp version again for a fix to XML validity for 3D. + * Version 1.43 released. 2013-12-18 Carl Hetherington <cth@carlh.net> @@ -115,7 +115,7 @@ def make_control(version, bits, filename): def dependencies(target): return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'), - ('libdcp', 'v0.87')) + ('libdcp', 'v0.88')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/debian/changelog b/debian/changelog index f689a0a83..8ddf90112 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.43-1) UNRELEASED; urgency=low +dcpomatic (1.44-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -47,8 +47,9 @@ dcpomatic (1.43-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington <carl@d1stkfactory> Wed, 18 Dec 2013 16:28:55 +0000 + -- Carl Hetherington <carl@d1stkfactory> Wed, 18 Dec 2013 19:55:16 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.44pre' +VERSION = '1.45pre' def options(opt): opt.load('compiler_cxx') @@ -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.87', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.88', 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) |