From 6dd8d3ee1553557289ca5046ea3a4cd9d1614fc2 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 18 Feb 2023 03:48:31 +0200 Subject: [PATCH] Set S3_2 to alpha mode See osdn #44374 Signed-off-by: Marko Lindqvist --- NEWS | 2 +- data/themes/gui-sdl2/human/theme.themespec | 4 ++-- fc_version | 8 ++++---- meson.build | 2 +- server/report.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index 9ca59c4f5f..41aed0060d 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ ====================== -Welcome to Freeciv x.x +Welcome to Freeciv 3.2 ====================== 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 5465d24038..0e00ade7a7 100644 --- a/data/themes/gui-sdl2/human/theme.themespec +++ b/data/themes/gui-sdl2/human/theme.themespec @@ -10,8 +10,8 @@ priority = 20 ; The font to be used: font_file = "themes/gui-sdl2/human/DejaVuSans.ttf" ; To use CJK fonts, provide the path to the font below. -; Fonts recommended for Freeciv can be fetched from git master, e.g.: -; https://raw.githubusercontent.com/freeciv/freeciv/master/data/themes/gui-sdl2/human/fireflysung.ttf +; Fonts recommended for Freeciv can be fetched from git S3_2 branch, e.g.: +; https://raw.githubusercontent.com/freeciv/freeciv/S3_2/data/themes/gui-sdl2/human/fireflysung.ttf font_file_zh_CN = "themes/gui-sdl2/human/fireflysung.ttf" font_file_ja = "themes/gui-sdl2/human/sazanami-gothic.ttf" font_file_ko = "themes/gui-sdl2/human/UnDotum.ttf" diff --git a/fc_version b/fc_version index 2a44d1fc5f..d9e6b45fab 100755 --- a/fc_version +++ b/fc_version @@ -8,14 +8,14 @@ MAJOR_VERSION="3" MINOR_VERSION="1" PATCH_VERSION="92" -EMERGENCY_VERSION="6" -VERSION_LABEL="-dev" +EMERGENCY_VERSION="7" +VERSION_LABEL="-alpha" # Type is either "development" or "stable" # Date is relevant only for "stable" releases if test "$VERSION_LABEL" = "" ; then RELEASE_TYPE="stable" - #RELEASE_DATE="2022-11-05" + #RELEASE_DATE="2023-02-24" else RELEASE_TYPE="development" fi @@ -60,7 +60,7 @@ NEXT_STABLE_VERSION="3.2.0" RELEASE_MONTH=0 MAIN_VERSION=3.2 -DATASUBDIR=dev +DATASUBDIR=test DEFAULT_FOLLOW_TAG=S3_2 # Freeciv network capstring: see documentation in common/capstr.c diff --git a/meson.build b/meson.build index 32f485eecc..031397d290 100644 --- a/meson.build +++ b/meson.build @@ -66,7 +66,7 @@ priv_conf_data.set('SYSCONFDIR', # Release cycle phases # See fc_version about proper values for these. -priv_conf_data.set('DATASUBDIR', 'dev') +priv_conf_data.set('DATASUBDIR', 'test') priv_conf_data.set('IS_DEVEL_VERSION', 1) priv_conf_data.set('IS_FREEZE_VERSION', 0) priv_conf_data.set('IS_BETA_VERSION', 0) diff --git a/server/report.c b/server/report.c index 44f5bf6ea1..9692773f57 100644 --- a/server/report.c +++ b/server/report.c @@ -1550,7 +1550,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.39.1