Merge master.

diff --cc ChangeLog
index 1bbaed6e5222024718f96bbe4e6c900e3625d9c1,00d83bf5906a347419607beabae8f2163b709f3a..38a8ea5ce01a929593fb280a30e2e505f7f22552
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,11 +1,15 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add subtitle view.
 +
+ 2014-04-29  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.67.1 released.
+ 
+ 2014-04-29  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.67.0 released.
+ 
  2014-04-27  Carl Hetherington  <cth@carlh.net>
  
        * Version 1.66.16 released.

diff --cc cscript
index 890c937e6f3d15e8be71bbe7b96418fdc017a027,5b2aebbbb3be9b199efee9d036ad710e9587fbd6..e1a987fdec0f73b13aa222b682ee0178d0ad5412
--- 1/cscript
--- 2/cscript
+++ b/cscript
@@@ -143,8 -143,8 +143,8 @@@ def make_control(debian_version, bits, 
          print >>f,''
  
  def dependencies(target):
-     return (('ffmpeg-cdist', 'a0db025'),
+     return (('ffmpeg-cdist', 'bba68a5'),
 -            ('libdcp', '8af7b48'))
 +            ('libdcp', '1.0'))
  
  def build(target, options):
      cmd = './waf configure --prefix=%s' % target.work_dir_cscript()

diff --cc wscript
index 64026191e324f25b64c58ebbc4409e51b801960e,6a4a702cbed80a667c99130c6f5998f686b0d183..1abaf5c2fc4ce579354d3914ef088aeb2446d9c9
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -49,12 -49,12 +49,12 @@@ def static_openjpeg(conf)
  
  def dynamic_openjpeg(conf):
      conf.check_cfg(package='libopenjpeg', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
-     conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.1', mandatory=True)
+     conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.2', mandatory=True)
  
  def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh):
 -    conf.check_cfg(package='libdcp', atleast_version='0.92', args='--cflags', uselib_store='DCP', mandatory=True)
 +    conf.check_cfg(package='libdcp-1.0', atleast_version='0.92', args='--cflags', uselib_store='DCP', mandatory=True)
      conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
 -    conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp']
 +    conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp', 'kumu-libdcp']
      conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
  
      if static_boost: