diff --git a/doc/templates/conf.py b/doc/templates/conf.py index 73f02fa34c..7becfaac98 100644 --- a/doc/templates/conf.py +++ b/doc/templates/conf.py @@ -71,7 +71,7 @@ # built documents. # # The short X.Y version. -version = 'Year.Day' +version = '2020.330' # The full version, including alpha/beta/rc tags. release = 'Jakarta' diff --git a/src/trunk/libs/seiscomp3/core/version.cpp b/src/trunk/libs/seiscomp3/core/version.cpp index 5bfb43b04b..f41ce0b608 100644 --- a/src/trunk/libs/seiscomp3/core/version.cpp +++ b/src/trunk/libs/seiscomp3/core/version.cpp @@ -45,11 +45,7 @@ FrameworkVersion CurrentVersion; FrameworkVersion::FrameworkVersion() { -#ifdef WITH_GIT_REVISION - _text = std::string("Jakarta git-") + git_revision(); -#else - _text = std::string("Jakarta git-unknown"); -#endif + _text = "Jakarta 2020.330"; }