Merge branch 'master' of ssh://houllier/home/carl/git/dvdomatic

diff --combined wscript
index 2bde0077e09f7286c57fb1c7426aa5684e0733f8,1e5adb86cb45d0fe9b2b20d406526eb5141d2de9..28d1f41bfe17bbe6baf8a92c4654c64c7c6f6daf
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -3,7 -3,7 +3,7 @@@ import o
  import sys
  
  APPNAME = 'dvdomatic'
 -VERSION = '0.38pre'
 +VERSION = '0.41pre'
  
  def options(opt):
      opt.load('compiler_cxx')
@@@ -61,7 -61,7 +61,7 @@@ def configure(conf)
      conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = True)
      conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True)
      conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True)
 -    conf.check_cfg(package = 'libdcp', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
 +    conf.check_cfg(package = 'libdcp', atleast_version = '0.07', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
      conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True)
      conf.check_cfg(package = '', path = 'Magick++-config', args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True)
      conf.check_cc(msg = 'Checking for library libtiff', function_name = 'TIFFOpen', header_name = 'tiffio.h', lib = 'tiff', uselib_store = 'TIFF')
@@@ -128,7 -128,7 +128,7 @@@ def build(bld)
          bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r)
  
  def dist(ctx):
-     ctx.excl = 'TODO core *~ src/wx/*~ src/lib/*~ .waf* build .git deps alignment hacks sync *.tar.bz2 *.exe .lock*'
+     ctx.excl = 'TODO core *~ src/wx/*~ src/lib/*~ .waf* build .git deps alignment hacks sync *.tar.bz2 *.exe .lock* *build-windows doc/manual/pdf doc/manual/html'
  
  def create_version_cc(version):
      if os.path.exists('.git'):