From: Art Cancro <ajc@citadel.org>
Date: Mon, 13 Jun 2022 01:01:55 +0000 (-0400)
Subject: Release version 954 generated by do-release.sh
X-Git-Tag: v954^0
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=48d8c5746a77de513326250e2eff20f17cb75420

Release version 954 generated by do-release.sh
---

diff --git a/citadel/server/citadel.h b/citadel/server/citadel.h
index 43574b8aa..5845dd960 100644
--- a/citadel/server/citadel.h
+++ b/citadel/server/citadel.h
@@ -28,7 +28,7 @@ extern "C" {
 // (We used to define this ourselves, but why bother when the build tools do it for us?)
 #define CITADEL	PACKAGE_STRING
 
-#define REV_LEVEL 953		// This version
+#define REV_LEVEL 954		// This version
 #define REV_MIN		591		// Oldest compatible database
 #define EXPORT_REV_MIN	931		// Oldest compatible export files
 #define LIBCITADEL_MIN	951		// Minimum required version of libcitadel
diff --git a/do-release.sh b/do-release.sh
index 78ccd9751..f557ca0ef 100755
--- a/do-release.sh
+++ b/do-release.sh
@@ -58,7 +58,7 @@ sed \
 	textclient/textclient.h
 
 libcitadel_version=`grep LIBCITADEL_VERSION_NUMBER  libcitadel/lib/libcitadel.h | sed s/"[^0-9.]"/""/g`
-citserver_version=`grep REV_LEVEL citadel/citadel.h | sed s/"[^0-9.]"/""/g`
+citserver_version=`grep REV_LEVEL citadel/server/citadel.h | sed s/"[^0-9.]"/""/g`
 webcit_version=`grep CLIENT_VERSION webcit/webcit.h | sed s/"[^0-9.]"/""/g`
 textclient_version=`grep CLIENT_VERSION textclient/textclient.h | sed s/"[^0-9.]"/""/g`
 
diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index b2dd904d9..07e892bb9 100644
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
-#define LIBCITADEL_VERSION_NUMBER 953
+#define LIBCITADEL_VERSION_NUMBER 954
 
 /*
  * Here's a bunch of stupid magic to make the MIME parser portable.
diff --git a/release_version.txt b/release_version.txt
index a8ed109da..8a8022aed 100644
--- a/release_version.txt
+++ b/release_version.txt
@@ -1 +1 @@
-953
+954
diff --git a/textclient/textclient.h b/textclient/textclient.h
index 85e9cf15a..0d7fe4a2f 100644
--- a/textclient/textclient.h
+++ b/textclient/textclient.h
@@ -11,7 +11,7 @@
 #define	UDS			"_UDS_"
 #define DEFAULT_HOST		"localhost"
 #define DEFAULT_PORT		"504"
-#define CLIENT_VERSION 953
+#define CLIENT_VERSION 954
 #define CLIENT_TYPE		0
 
 // commands we can send to the stty_ctdl() routine
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 35de86fea..fc6b975a0 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -127,7 +127,7 @@ extern char *ssl_cipher_list;
 #define PORT_NUM		80			/* port number to listen on */
 #define DEVELOPER_ID		0
 #define CLIENT_ID		4
-#define CLIENT_VERSION 953		/* This version of WebCit */
+#define CLIENT_VERSION 954		/* This version of WebCit */
 #define MINIMUM_CIT_VERSION	931			/* Minimum required version of Citadel server */
 #define	LIBCITADEL_MIN		931			/* Minimum required version of libcitadel */
 #define DEFAULT_CTDLDIR		"/usr/local/citadel"	/* Default Citadel server directory */