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

3 files changed, 11 insertions, 2 deletions

diff --git a/cscript b/cscript
index bab0d4fd5..cf6c412ae 100644
--- a/cscript
+++ b/cscript
@@ -535,7 +535,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', 'v1.9.20', {'c++17': target.platform.startswith('osx')})]
+    deps = [('libdcp', 'v1.9.21', {'c++17': target.platform.startswith('osx')})]
     deps.append(('libsub', 'v1.6.52'))
     deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
     deps.append(('rtaudio', 'f619b76'))
@@ -767,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.1" if target.version in ("16.04", "18.04", "20.04", "22.04") else "3.2")
+||||||| 4f850f995
+    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")
+=======
+    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", "unstable", "11", "12") else "3.2")
+>>>>>>> origin/main
     if not target.debug:
         target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs')
 
diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc
index a7afac7ff..1a5f7ce27 100644
--- a/src/wx/supporters.cc
+++ b/src/wx/supporters.cc
@@ -629,6 +629,7 @@ supported_by.Add (wxT ("Karn Karamad"));
 supported_by.Add (wxT ("Klaus Karger"));
 supported_by.Add (wxT ("Ikram Karimov"));
 supported_by.Add (wxT ("Toni Karsch"));
+supported_by.Add (wxT ("Karu-Karu"));
 supported_by.Add (wxT ("Cornelis Kater"));
 supported_by.Add (wxT ("Abdelrahim Kattab"));
 supported_by.Add (wxT ("Jonathan Kawchuk"));
diff --git a/wscript b/wscript
index b55bd1833..60a837dd9 100644
--- a/wscript
+++ b/wscript
@@ -35,7 +35,7 @@ except ImportError:
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-libdcp_version = '1.9.15'
+libdcp_version = '1.9.21'
 libsub_version = '1.6.49'
 
 this_version = subprocess.Popen(['git', 'tag', '-l', '--points-at', 'HEAD'], stdout=subprocess.PIPE).communicate()[0]