diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-03-24 22:36:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-03-25 00:33:42 +0100 |
| commit | 94c5406966c255fc5f9d265b09b3f16441e36ca4 (patch) | |
| tree | ab382714d0d6285f911e9ed6c8a04050ae0f9ae8 | |
| parent | a60668a37f05a125954ac5e03db0530995ac5769 (diff) | |
Prepare for Ubuntu 23.04.
| -rw-r--r-- | cscript | 21 | ||||
| -rwxr-xr-x | debian/rules | 16 |
2 files changed, 29 insertions, 8 deletions
@@ -35,6 +35,9 @@ for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']: for v in ['22.04', '22.10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-dev', 'python3.10']) +for v in ['23.04']: + deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) + deb_build_depends[v].extend(['libssh-dev', 'python3.11']) for v in ['9', '10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python']) @@ -157,6 +160,23 @@ deb_depends['22.10'].extend(['libboost-filesystem1.74.0', 'libxerces-c3.2', 'libnanomsg5']) +deb_depends['23.04'] = copy.deepcopy(deb_depends_base) +deb_depends['23.04'].extend(['libboost-filesystem1.74.0', + 'libboost-thread1.74.0', + 'libboost-regex1.74.0', + 'libboost-date-time1.74.0', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libxml++2.6-2v5', + 'libzip4', + 'libicu72', + 'libnettle8', + 'libssh-4', + 'libx264-164', + 'libcurl4', + 'libpulse0', + 'libxerces-c3.2', + 'libnanomsg5']) deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', @@ -678,6 +698,7 @@ def package_debian(target, cpu, version, options): target.set('CDIST_CONFIGURE', '"' + configure_options(target, options, for_package=True) + '"') target.set('CDIST_PACKAGE', f'dcpomatic{suffix}') + target.set('CDIST_WX_VERSION', "3.2" if target.version == "23.04" else "3.1") if not target.debug: target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs') diff --git a/debian/rules b/debian/rules index 860b97ff7..fead4a0b0 100755 --- a/debian/rules +++ b/debian/rules @@ -22,21 +22,21 @@ override_dh_auto_build: override_dh_auto_install: ./waf install --destdir=debian/$(CDIST_PACKAGE) mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/de/LC_MESSAGES/ - cp -a /usr/share/locale/de/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/de/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/locale/de/LC_MESSAGES/wxstd-$(CDIST_WX_VERSION).mo debian/$(CDIST_PACKAGE)/usr/share/locale/de/LC_MESSAGES/dcpomatic2-wxstd.mo mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/es/LC_MESSAGES/ - cp -a /usr/share/locale/es/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/es/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/locale/es/LC_MESSAGES/wxstd-$(CDIST_WX_VERSION).mo debian/$(CDIST_PACKAGE)/usr/share/locale/es/LC_MESSAGES/dcpomatic2-wxstd.mo mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/fr/LC_MESSAGES/ - cp -a /usr/share/locale/fr/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/fr/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/locale/fr/LC_MESSAGES/wxstd-$(CDIST_WX_VERSION).mo debian/$(CDIST_PACKAGE)/usr/share/locale/fr/LC_MESSAGES/dcpomatic2-wxstd.mo mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/it/LC_MESSAGES/ - cp -a /usr/share/locale/it/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/it/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/locale/it/LC_MESSAGES/wxstd-$(CDIST_WX_VERSION).mo debian/$(CDIST_PACKAGE)/usr/share/locale/it/LC_MESSAGES/dcpomatic2-wxstd.mo mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/sv/LC_MESSAGES/ - cp -a /usr/share/locale/sv/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/sv/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/locale/sv/LC_MESSAGES/wxstd-$(CDIST_WX_VERSION).mo debian/$(CDIST_PACKAGE)/usr/share/locale/sv/LC_MESSAGES/dcpomatic2-wxstd.mo mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/nl/LC_MESSAGES/ - cp -a /usr/share/locale/nl/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/nl/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/locale/nl/LC_MESSAGES/wxstd-$(CDIST_WX_VERSION).mo debian/$(CDIST_PACKAGE)/usr/share/locale/nl/LC_MESSAGES/dcpomatic2-wxstd.mo mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/pl/LC_MESSAGES/ - cp -a /usr/share/locale/pl/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/pl/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/locale/pl/LC_MESSAGES/wxstd-$(CDIST_WX_VERSION).mo debian/$(CDIST_PACKAGE)/usr/share/locale/pl/LC_MESSAGES/dcpomatic2-wxstd.mo mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/ru/LC_MESSAGES/ - cp -a /usr/share/locale/ru/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/ru/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/locale/ru/LC_MESSAGES/wxstd-$(CDIST_WX_VERSION).mo debian/$(CDIST_PACKAGE)/usr/share/locale/ru/LC_MESSAGES/dcpomatic2-wxstd.mo cp -a $(CDIST_DIRECTORY)/src/openssl/apps/openssl debian/$(CDIST_PACKAGE)/usr/bin/dcpomatic2_openssl cp -a $(CDIST_DIRECTORY)/src/libdcp/build/tools/dcpverify debian/$(CDIST_PACKAGE)/usr/bin/dcpomatic2_verify cp -a $(CDIST_DIRECTORY)/src/libdcp/build/tools/dcpkdm debian/$(CDIST_PACKAGE)/usr/bin/dcpomatic2_kdm_inspect |