From 20e7fd3d37cbc66101d31f1f0d220abd2976bed9 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 6 Jul 2022 21:41:14 +0300 Subject: [PATCH 03/29] Freeze datafile formats - Bump datafile capstrings to their final freeciv-3.1 form - Set version number to 3.1.0, and freeze version flag on - Set datasubdir to "3.1" See osdn #44342 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 6a2a4ee31f..b43353ee63 100755 --- a/fc_version +++ b/fc_version @@ -6,9 +6,9 @@ # Version definition for Freeciv. MAJOR_VERSION="3" -MINOR_VERSION="0" -PATCH_VERSION="94" -EMERGENCY_VERSION="9" +MINOR_VERSION="1" +PATCH_VERSION="0" +EMERGENCY_VERSION="" VERSION_LABEL="-alpha3+" # @@ -42,7 +42,7 @@ VERSION_LABEL="-alpha3+" # windows/installer_msys2/Makefile --with-followtag to "windows" IS_DEVEL_VERSION=1 -IS_FREEZE_VERSION=0 +IS_FREEZE_VERSION=1 IS_BETA_VERSION=0 NEXT_STABLE_VERSION="3.1.0" @@ -50,7 +50,7 @@ NEXT_STABLE_VERSION="3.1.0" # 0 to disable display of release month until we can make better estimate RELEASE_MONTH=0 -DATASUBDIR=test +DATASUBDIR=3.1 DEFAULT_FOLLOW_TAG=S3_1 # Freeciv network capstring: see documentation in common/capstr.c diff --git a/meson.build b/meson.build index c4ff101790..40c583fcdb 100644 --- a/meson.build +++ b/meson.build @@ -28,9 +28,9 @@ priv_conf_data.set('SYSCONFDIR', # Release cycle phases # See fc_version about proper values for these. -priv_conf_data.set('DATASUBDIR', 'test') +priv_conf_data.set('DATASUBDIR', '3.1') 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.1.0"') -- 2.35.1