diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-09-16 10:30:45 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-09-16 10:30:45 +0200 |
| commit | 3b56dc791dabc5da4bfeecae310dc2a15077d486 (patch) | |
| tree | 9effd603fb9a33cd9baeb72d2a99772e393a0ec1 | |
| parent | c1d3f6f4f645e76302ca4262de3517497fa1e14b (diff) | |
Fix mis-merge.
| -rw-r--r-- | cscript | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -767,16 +767,8 @@ 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') |