From b90c43c9ca3d0b3c016253edd1c6403133336a86 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Tue, 26 Jan 2021 11:18:51 +0100
Subject: [PATCH] Updated changelog

---
 CHANGELOG.md             | 2 ++
 configure/modules/CONFIG | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92a0435e..571f2db6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * Added back `promptE3Env.bash`, which runs `setE3Env.bash` and then sets the bash prompt.
 * Added descriptions for more targets when running `make help`
+* Build numbers are now prefixed with a `+`.
 
 ## Bugfixes
 
@@ -16,6 +17,7 @@
 * Removed all references to `sudo`. If `sudo` needs to be used, it should be done manually.
 * Fixed issue with module name checking which caused modules to fail to build on certain linux distributions
 * Exact module version is fetched correctly at build-time to ensure that new releases do not affect upstream dependencies
+* Issue involving priority between some test versions fixed
 
 ## Other changes
 * Removed `require` as a submodule and merged it into `e3-require`.
diff --git a/configure/modules/CONFIG b/configure/modules/CONFIG
index 3c30825d..671f61ef 100644
--- a/configure/modules/CONFIG
+++ b/configure/modules/CONFIG
@@ -1,8 +1,6 @@
 # -*- mode: Makefile;-*-
 
-BUILD_SEPARATOR = +
-
-E3_MODULE_VERSION:=$(E3_MODULE_VERSION)$(shell [[ "$(E3_MODULE_VERSION)" =~ ^[0-9]+\.[0-9]+\.[0-9]+$$ ]] && echo $(BUILD_SEPARATOR)0)
+E3_MODULE_VERSION:=$(E3_MODULE_VERSION)$(shell [[ "$(E3_MODULE_VERSION)" =~ ^[0-9]+\.[0-9]+\.[0-9]+$$ ]] && echo +0)
 
 include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION
 include $(REQUIRE_CONFIG)/CONFIG_REQUIRE
-- 
GitLab