Cleanup: missing word in comment.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index d789c713cd2c55dfc423baa313c27351c0d6818d..6f7399f55403bfcdddf7cddcee14adc56eeb9384 100644 (file)
--- a/cscript
+++ b/cscript
@@ -533,7 +533,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
 
 def dependencies(target, options):
-    deps = [('libdcp', '9b9af8a80860210c6a29446f7a24795eeda9e7bc', {'c++17': target.platform == 'osx'})]
+    deps = [('libdcp', 'v1.9.7', {'c++17': target.platform == 'osx'})]
     deps.append(('libsub', 'v1.6.47'))
     deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
     deps.append(('rtaudio', 'f619b76'))
@@ -745,12 +745,12 @@ def package_debian(target, cpu, version, options):
 
     os.makedirs('build/deb')
     os.chdir('build/deb')
-    shutil.move(f'../../dcpomatic-{version}.tar.bz2', f'{name}_{version}.orig.tar.bz2')
-    target.command(f'tar xjf {name}_{version}.orig.tar.bz2')
+    shutil.move(f'../../dcpomatic-{version}.tar.bz2', f'{name}_1+{version}.orig.tar.bz2')
+    target.command(f'tar xjf {name}_1+{version}.orig.tar.bz2')
     os.chdir(f'dcpomatic-{version}')
 
     with open('debian/changelog', 'w') as f:
-        print(f'{name} ({version}-1) unstable; urgency=medium', file=f)
+        print(f'{name} (1+{version}-1) unstable; urgency=medium', file=f)
         print('', file=f)
         print('  * New upstream release.', file=f)
         print('', file=f)
@@ -935,7 +935,11 @@ def test(target, options, test):
     if target.platform == 'windows':
         cmd = 'run\\tests '
     else:
-        cmd = 'run/tests --check --log_level=test_suite '
+        cmd = 'run/tests '
+    if target.environment_prefix:
+        cmd += '-e %s ' % target.environment_prefix
+    if target.platform != 'windows':
+        cmd += ' --check --log_level=test_suite '
     if target.debug:
         cmd += '--backtrace '
     if test is not None: