From ead5a07ba17a63d8a37acdc6afc7110af59e3f96 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 30 Aug 2026 12:12:09 +0300 Subject: [PATCH 40/40] Freeze datafile formats See RM #1631 Signed-off-by: Marko Lindqvist --- fc_version | 10 +++++----- meson.build | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fc_version b/fc_version index 06bc40534d..0915518780 100755 --- a/fc_version +++ b/fc_version @@ -6,9 +6,9 @@ # Version definition for Freeciv. MAJOR_VERSION="3" -MINOR_VERSION="2" -PATCH_VERSION="94" -EMERGENCY_VERSION="6" +MINOR_VERSION="3" +PATCH_VERSION="0" +EMERGENCY_VERSION="" VERSION_LABEL="-alpha2+" # Type is either "development" or "stable" @@ -54,7 +54,7 @@ fi # platforms/windows/installer_msys2/Makefile.meson -Dfollowtag to "windows" IS_DEVEL_VERSION=1 -IS_FREEZE_VERSION=0 +IS_FREEZE_VERSION=1 IS_BETA_VERSION=0 NEXT_STABLE_VERSION="3.3.0" @@ -63,7 +63,7 @@ NEXT_STABLE_VERSION="3.3.0" RELEASE_MONTH=0 MAIN_VERSION=3.3 -DATASUBDIR=test +DATASUBDIR=3.3 DEFAULT_FOLLOW_TAG=S3_3 # Freeciv network capstring: see documentation in common/capstr.c diff --git a/meson.build b/meson.build index 45c0360bca..526980992e 100644 --- a/meson.build +++ b/meson.build @@ -158,10 +158,10 @@ priv_conf_data.set('SYSCONFDIR', # Release cycle phases # See fc_version about proper values for these. -datasubdir = 'test' +datasubdir = '3.3' priv_conf_data.set('DATASUBDIR', datasubdir) priv_conf_data.set('IS_DEVEL_VERSION', 1) -priv_conf_data.set('IS_FREEZE_VERSION', 0) +priv_conf_data.set('IS_FREEZE_VERSION', 1) priv_conf_data.set('IS_BETA_VERSION', 0) priv_conf_data.set('FREECIV_RELEASE_MONTH', 0) priv_conf_data.set('NEXT_STABLE_VERSION', '"3.3.0"') -- 2.53.0