From 2fe16d27dec577bcef3be7df7d1312c59fbb3e36 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 28 Aug 2026 17:44:04 +0300 Subject: [PATCH 2/2] Set S3_4 to alpha mode See RM #1380 Signed-off-by: Marko Lindqvist --- NEWS | 2 +- data/themes/gui-sdl2/human/theme.themespec | 4 ++-- data/themes/gui-sdl3/human/theme.themespec | 4 ++-- fc_version | 12 ++++++------ meson.build | 2 +- server/report.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NEWS b/NEWS index dcdf217e4e..a7fef8b27e 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ ====================== -Welcome to Freeciv x.x +Welcome to Freeciv 3.4 ====================== The most important changes between major releases are shown below. diff --git a/data/themes/gui-sdl2/human/theme.themespec b/data/themes/gui-sdl2/human/theme.themespec index 971b1bcfd1..270ecb6252 100644 --- a/data/themes/gui-sdl2/human/theme.themespec +++ b/data/themes/gui-sdl2/human/theme.themespec @@ -12,8 +12,8 @@ default_font_file = "themes/gui-sdl2/human/DejaVuSans.ttf" default_font_size = 10 ; To use CJK fonts, provide the path to the font below. -; Fonts recommended for Freeciv can be fetched from git main branch, e.g.: -; https://raw.githubusercontent.com/freeciv/freeciv/main/data/themes/gui-sdl2/human/fireflysung.ttf +; Fonts recommended for Freeciv can be fetched from git S3_4 branch, e.g.: +; https://raw.githubusercontent.com/freeciv/freeciv/S3_4/data/themes/gui-sdl2/human/fireflysung.ttf fonts = { "langname", "font_file" "zh_CN", "themes/gui-sdl2/human/fireflysung.ttf" diff --git a/data/themes/gui-sdl3/human/theme.themespec b/data/themes/gui-sdl3/human/theme.themespec index 006d839618..94b1265075 100644 --- a/data/themes/gui-sdl3/human/theme.themespec +++ b/data/themes/gui-sdl3/human/theme.themespec @@ -12,8 +12,8 @@ default_font_file = "themes/gui-sdl3/human/DejaVuSans.ttf" default_font_size = 10 ; To use CJK fonts, provide the path to the font below. -; Fonts recommended for Freeciv can be fetched from git main branch, e.g.: -; https://raw.githubusercontent.com/freeciv/freeciv/main/data/themes/gui-sdl3/human/fireflysung.ttf +; Fonts recommended for Freeciv can be fetched from git S3_4 branch, e.g.: +; https://raw.githubusercontent.com/freeciv/freeciv/S3_4/data/themes/gui-sdl3/human/fireflysung.ttf fonts = { "langname", "font_file" "zh_CN", "themes/gui-sdl3/human/fireflysung.ttf" diff --git a/fc_version b/fc_version index 079af327aa..5c7fa8d232 100755 --- a/fc_version +++ b/fc_version @@ -1,25 +1,25 @@ #!/bin/sh # -# Copyright (C) 2004-2026 Freeciv team +# Copyright (C) 2004-2027 Freeciv team # Version definition for Freeciv. MAJOR_VERSION="3" MINOR_VERSION="3" PATCH_VERSION="90" -EMERGENCY_VERSION="14" -VERSION_LABEL="-dev" +EMERGENCY_VERSION="15" +VERSION_LABEL="-alpha" # Type is either "development" or "stable" # Date and NEWS URL are relevant only for "stable" releases if test "${VERSION_LABEL}" = "" ; then RELEASE_TYPE="stable" - #RELEASE_DATE="2025-01-17" + #RELEASE_DATE="2027-01-01" NEWS_URL="https://www.freeciv.org/wiki/NEWS-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}" else RELEASE_TYPE="development" - #RELEASE_DATE="2025-01-17" + #RELEASE_DATE="2027-01-01" #NEWS_URL="https://www.freeciv.org/wiki/NEWS-3.4.0" fi @@ -63,7 +63,7 @@ NEXT_STABLE_VERSION="3.4.0" RELEASE_MONTH=0 MAIN_VERSION=3.4 -DATASUBDIR=dev +DATASUBDIR=test DEFAULT_FOLLOW_TAG=S3_4 # Freeciv network capstring: see documentation in common/capstr.c diff --git a/meson.build b/meson.build index 9c985e7134..f415e2ad4c 100644 --- a/meson.build +++ b/meson.build @@ -158,7 +158,7 @@ priv_conf_data.set('SYSCONFDIR', # Release cycle phases # See fc_version about proper values for these. -datasubdir = 'dev' +datasubdir = 'test' priv_conf_data.set('DATASUBDIR', datasubdir) priv_conf_data.set('IS_DEVEL_VERSION', 1) priv_conf_data.set('IS_FREEZE_VERSION', 0) diff --git a/server/report.c b/server/report.c index 4389f4c595..e2b44eae9e 100644 --- a/server/report.c +++ b/server/report.c @@ -1585,7 +1585,7 @@ void log_civ_score_now(void) fprintf(score_log->fp, "\n" "# For a specification of the format of this see doc/README.scorelog or \n" - "# .\n" + "# .\n" "\n"); fprintf(score_log->fp, "id %s\n", server.game_identifier); -- 2.53.0