Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 806864f210e079fb050cbb50cfac60191ece3bd8..519e0d8069634d30b6309f2adfb4a8f916dbc6f7 100644 (file)
--- a/cscript
+++ b/cscript
@@ -193,9 +193,9 @@ def make_control(debian_version, bits, filename, debug):
     packages('Depends', deb_depends[debian_version], f)
 
     print('Description: Generator of Digital Cinema Packages (DCPs)', file=f)
-    print('  DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio', file=f)
-    print('  files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant', file=f)
-    print('  digital projectors.', file=f)
+    print('  DCP-o-matic generates Digital Cinema Packages (DCPs) from videos, images,', file=f)
+    print('  sound and subtitle files.  You can use it to make content for playback on DCI-compliant', file=f)
+    print('  cinema projectors.', file=f)
 
     if debug:
         print('', file=f)
@@ -292,8 +292,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '5fce90f', ffmpeg_options),
-            ('libdcp', '99308eb'),
-            ('libsub', 'e02cc57'),
+            ('libdcp', '8b72edd'),
+            ('libsub', '05c6345'),
             ('rtaudio-cdist', None))
 
 def configure_options(target):
@@ -416,7 +416,7 @@ def package(target, version):
 
         if target.distro == 'debian' or target.distro == 'ubuntu':
             return package_debian(target, cpu, version)
-        elif target.distro == 'centos' or target.distro == 'fedora':
+        elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia':
             return package_rpm(target, cpu, version)
     elif target.platform == 'osx':
         target.command('bash platform/osx/make_dmg.sh %s' % target.directory)