diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-09-21 12:00:42 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-09-21 12:00:42 +0200 |
| commit | 6202999dc59f90cb5a0f51f306af5b744af2301b (patch) | |
| tree | 58af4823b596e6277f6926d206da3d1fc6821b44 /cscript | |
| parent | a285abf09235bc814fdc0acbdac837d360a10357 (diff) | |
Fix mis-merge.
Diffstat (limited to 'cscript')
| -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.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') |