[epiphany/gnome-3-38] Revert "Post-release version bump to new version scheme"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/gnome-3-38] Revert "Post-release version bump to new version scheme"
- Date: Tue, 6 Oct 2020 15:34:44 +0000 (UTC)
commit 886215ad17bdd29a1d7162134042e32e396d9543
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Tue Oct 6 10:34:30 2020 -0500
Revert "Post-release version bump to new version scheme"
This reverts commit df1f3d524f75c74e1e24305b283ea050d602603f.
Oops, this shouldn't be on gnome-3-38.
meson.build | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index da852ceb5..2b570a6a2 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
project('epiphany', 'c',
license: 'GPL3+',
- version: '40.alpha',
+ version: '3.38.0',
meson_version: '>= 0.46.0',
default_options: ['c_std=gnu11',
'warning_level=2']
@@ -58,12 +58,8 @@ conf.set10('TECH_PREVIEW', tech_preview)
version_array = meson.project_version().split('.')
conf.set('EPHY_MAJOR_VERSION', version_array[0].to_int())
-if version_array[1] in ['alpha', 'beta']
- conf.set('EPHY_MINOR_VERSION', 0)
-else
- conf.set('EPHY_MINOR_VERSION', version_array[1].to_int())
-endif
-conf.set('EPHY_MICRO_VERSION', 0)
+conf.set('EPHY_MINOR_VERSION', version_array[1].to_int())
+conf.set('EPHY_MICRO_VERSION', version_array[2].to_int())
conf.set_quoted('VERSION', '@VCS_TAG@')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]