Update versioning format in README and JSON files; add init-configure patch for milestone handling

README.md

@@ -44,13 +44,12 @@ We keep track of how many issues are closed at the end of the month in [docs/iss
 
 ### Versioning
 
-Zen uses [Semantic Versioning](https://semver.org/) for versioning. Meaning, versions are displayed as `a.b.c-d.e` where:
+Zen uses [Semantic Versioning](https://semver.org/) for versioning. Meaning, versions are displayed as `a.bc.d` where:
 
 - `a` is the major version
 - `b` is the minor version
-- `c` is the patch version
-- `d` is the branch prefix
-- `e` is the build number
+- `c` is the branch prefix
+- `d` is the patch version
 
 ### Branches
 

src/build/moz-configure/init-configure.patch

@@ -0,0 +1,13 @@
+diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
+index de6ff563b1241c91af2d0f9a31291c4c3b557a17..869480aebf6c4f4e2c81096f9320fcce99d493da 100644
+--- a/build/moz.configure/init.configure
++++ b/build/moz.configure/init.configure
+@@ -1101,7 +1101,7 @@ def milestone(build_env, build_project, version_path, as_milestone, _):
+ 
+     is_nightly = is_release_or_beta = None
+ 
+-    if "a1" in milestone:
++    if "t" in milestone:
+         is_nightly = True
+     elif "a" not in milestone:
+         is_release_or_beta = True

surfer.json

@@ -18,7 +18,7 @@
       "brandShortName": "Zen Browser",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.0.2-b.5",
+        "displayVersion": "1.2b.5",
         "github": {
           "repo": "zen-browser/desktop"
         },
@@ -38,7 +38,7 @@
       "brandShortName": "Zen Twilight",
       "brandFullName": "Zen Twilight",
       "release": {
-        "displayVersion": "1.0.2-t.6",
+        "displayVersion": "1.2t.6",
         "github": {
           "repo": "zen-browser/desktop"
         }