Merge branch 'master' into content-rework-take5

diff --combined cscript
index 07840c1097764f73421bb74cb494cddeeeb7c029,eac0fb08969c89d2292defc69eca3f7e40fb0c96..15647c2cebc3414296fadb21f2beb0f2d6cd89a6
--- 1/cscript
--- 2/cscript
+++ b/cscript
@@@ -1,8 -1,8 +1,8 @@@
  import glob
  
- builds = ['ubuntu-12.04-32', 'ubuntu-12.10-32', 'ubuntu-12.04-64', 'ubuntu-12.10-64', 'source', 'windows-32', 'windows-64']
+ releases = ['ubuntu-12.04-32', 'ubuntu-12.10-32', 'ubuntu-12.04-64', 'ubuntu-12.10-64', 'source', 'windows-32', 'windows-64']
  
- def build(environment, variant, version):
+ def release(environment, variant, version):
      if environment == 'windows':
          command('./waf configure --target-windows')
          command('./waf clean')
@@@ -25,13 -25,13 +25,13 @@@
          shutil.copyfile(os.path.join('builds', 'control-%s' % variant), os.path.join('debian', 'control'))
          command('./waf dist')
          f = open(os.path.join('debian', 'files'), 'w')
 -        print >>f,'dvdomatic_%s-1_%s.deb video extra' % (version, cpu)
 +        print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu)
          shutil.rmtree('build/deb', ignore_errors=True)
          os.makedirs('build/deb')
          os.chdir('build/deb')
 -        shutil.move('../../dvdomatic-%s.tar.bz2' % version, 'dvdomatic_%s.orig.tar.bz2' % version)
 -        command('tar xjf dvdomatic_%s.orig.tar.bz2' % version)
 -        os.chdir('dvdomatic-%s' % version)
 +        shutil.move('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version)
 +        command('tar xjf dcpomatic_%s.orig.tar.bz2' % version)
 +        os.chdir('dcpomatic-%s' % version)
          command('dch -b -v %s-1 "New upstream release."' % version)
          command('dpkg-source -b .')
          command('dpkg-buildpackage')
@@@ -39,9 -39,9 +39,9 @@@
  
  def make_pot():
      command('./waf pot')
 -    return [os.path.abspath('build/src/lib/libdvdomatic.pot'),
 -            os.path.abspath('build/src/wx/libdvdomatic-wx.pot'),
 -          os.path.abspath('build/src/tools/dvdomatic.pot')]
 +    return [os.path.abspath('build/src/lib/libdcpomatic.pot'),
 +            os.path.abspath('build/src/wx/libdcpomatic-wx.pot'),
 +          os.path.abspath('build/src/tools/dcpomatic.pot')]
  
  def make_manual():
      os.chdir('doc/manual')