From: Carl Hetherington <cth@carlh.net>
Date: Thu, 19 Dec 2013 17:49:51 +0000 (+0000)
Subject: Merge branch '1.0' into 1.0-seek
X-Git-Tag: v2.0.48~922^2~43
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=c94f29d333e1b81aabbc396920250844460d46f6;hp=0b2223212b20910717d63d65517b4a8abe5d2bd4

Merge branch '1.0' into 1.0-seek
---

diff --git a/ChangeLog b/ChangeLog
index 3d24aad88..4dc4ba75a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-12-19  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.45 released.
+
+2013-12-19  Carl Hetherington  <cth@carlh.net>
+
+	* Bump libdcp version again for a crash fix for 32-bit Windows,
+	and also for problems generating certificate chains.
+
 2013-12-18  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.44 released.
diff --git a/cscript b/cscript
index 5be114103..523eec544 100644
--- a/cscript
+++ b/cscript
@@ -115,7 +115,7 @@ def make_control(version, bits, filename):
 
 def dependencies(target):
     return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'),
-            ('libdcp', 'v0.88'))
+            ('libdcp', 'v0.90'))
 
 def build(target):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
diff --git a/debian/changelog b/debian/changelog
index 8ddf90112..2ae1e1bb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.44-1) UNRELEASED; urgency=low
+dcpomatic (1.45-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -48,8 +48,9 @@ dcpomatic (1.44-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 18 Dec 2013 19:55:16 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 19 Dec 2013 16:26:56 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index fa83b865f..f571d51a6 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.45pre'
+VERSION = '1.46pre'
 
 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.88', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
+    conf.check_cfg(package='libdcp',        atleast_version='0.90', 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)