From 56dda0eda6f4965ce503970d8828d6545e1bf030 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 9 Jan 2021 00:26:53 +0200
Subject: [PATCH 3/4] Rename comments-3.1 as comments-3.2

See osdn #41125

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 data/ruledit/Makefile.am                            | 2 +-
 data/ruledit/{comments-3.1.txt => comments-3.2.txt} | 0
 meson.build                                         | 2 +-
 scripts/spec_propagate.sh                           | 4 ++--
 tools/ruleutil/comments.h                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename data/ruledit/{comments-3.1.txt => comments-3.2.txt} (100%)

diff --git a/data/ruledit/Makefile.am b/data/ruledit/Makefile.am
index f4f08db268..b4eb0656aa 100644
--- a/data/ruledit/Makefile.am
+++ b/data/ruledit/Makefile.am
@@ -4,6 +4,6 @@
 pkgdatadir = $(datadir)/$(PACKAGE)/ruledit
 
 pkgdata_DATA =          \
-	comments-3.1.txt
+	comments-3.2.txt
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/data/ruledit/comments-3.1.txt b/data/ruledit/comments-3.2.txt
similarity index 100%
rename from data/ruledit/comments-3.1.txt
rename to data/ruledit/comments-3.2.txt
diff --git a/meson.build b/meson.build
index 49b9a563e0..082f750216 100644
--- a/meson.build
+++ b/meson.build
@@ -635,7 +635,7 @@ executable('freeciv-server',
 
 
 install_data(
-  'data/ruledit/comments-3.1.txt',
+  'data/ruledit/comments-3.2.txt',
   install_dir : join_paths(get_option('datadir'), 'freeciv/ruledit')
   )
 
diff --git a/scripts/spec_propagate.sh b/scripts/spec_propagate.sh
index 7280c45f1c..0f233d1421 100755
--- a/scripts/spec_propagate.sh
+++ b/scripts/spec_propagate.sh
@@ -38,8 +38,8 @@ patch_rulesetdir() {
     if [ "x$rej" != x ]; then
         echo "*** fix up rejects manually: $rej"
     fi
-    if [ -f "data/ruledit/comments-3.1.txt" ]; then
-        echo "*** fix up ruledit manually: data/ruledit/comments-3.1.txt"
+    if [ -f "data/ruledit/comments-3.2.txt" ]; then
+        echo "*** fix up ruledit manually: data/ruledit/comments-3.2.txt"
     fi
 }
 
diff --git a/tools/ruleutil/comments.h b/tools/ruleutil/comments.h
index 5e9192723e..a63bddf9d2 100644
--- a/tools/ruleutil/comments.h
+++ b/tools/ruleutil/comments.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#define COMMENTS_FILE_NAME "comments-3.1.txt"
+#define COMMENTS_FILE_NAME "comments-3.2.txt"
 
 struct section_file;
 
-- 
2.29.2