Merge remote-tracking branch 'origin/main' into v2.17.x

1 files changed, 12 insertions, 3 deletions

diff --git a/cscript b/cscript
index 6aa46ffde..c83bb8b64 100644
--- a/cscript
+++ b/cscript
@@ -45,7 +45,7 @@ for v in ['22.04']:
 for v in ['23.04', '23.10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-dev', 'python3.11'])
-for v in ['24.04']:
+for v in ['24.04', '24.10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-dev', 'python3.12'])
 for v in ['9', '10']:
@@ -218,6 +218,7 @@ def debs(boost, icu, x264):
     return output
 
 deb_depends['24.04'] = debs(boost='1.83.0', icu='74', x264='164')
+deb_depends['24.10'] = debs(boost='1.83.0', icu='74', x264='164')
 
 deb_depends['9'] = copy.deepcopy(deb_depends_base)
 deb_depends['9'].extend(['libboost-filesystem1.62.0',
@@ -534,8 +535,8 @@ 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', 'v1.9.19', {'c++17': target.platform.startswith('osx')})]
-    deps.append(('libsub', 'v1.6.51'))
+    deps = [('libdcp', 'v1.9.20', {'c++17': target.platform.startswith('osx')})]
+    deps.append(('libsub', 'v1.6.52'))
     deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -766,8 +767,16 @@ def package_debian(target, cpu, version, options):
     target.set('CDIST_DIRECTORY', target.directory)
 
     target.set('CDIST_CONFIGURE', '"' + configure_options(target, options, for_package=True) + '"')
+<<<<<<< HEAD
     target.set('CDIST_PACKAGE', f'{name}{suffix}')
     target.set('CDIST_WX_VERSION', "3.2" if target.version in ("23.04", "23.10", "24.04") else "3.1")
+||||||| e96f917d5
+    target.set('CDIST_PACKAGE', f'dcpomatic{suffix}')
+    target.set('CDIST_WX_VERSION', "3.2" if target.version in ("23.04", "23.10", "24.04") else "3.1")
+=======
+    target.set('CDIST_PACKAGE', f'dcpomatic{suffix}')
+    target.set('CDIST_WX_VERSION', "3.1" if target.version in ("16.04", "18.04", "20.04", "22.04") else "3.2")
+>>>>>>> origin/main
     if not target.debug:
         target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs')