diff options
| author | Bryce Harrington <bryce@osg.samsung.com> | 2017-02-03 17:23:24 -0800 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2017-02-03 17:23:24 -0800 |
| commit | 819824d605547a23c68999bec5133c2387c20e1e (patch) | |
| tree | f76e2f825b4fc2f45135547b58911decdb75ec45 | |
| parent | 7c1fb3ff51d37a75fae6e7803d620de87ac9898c (diff) | |
releasing: Copyedits
| -rw-r--r-- | releasing.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/releasing.txt b/releasing.txt index a01fe376..c01770f2 100644 --- a/releasing.txt +++ b/releasing.txt @@ -10,15 +10,16 @@ To make a release of Weston and/or Wayland, follow these steps. release with any needed protocol updates. 2. Update the first stanza of configure.ac to the intended versions - for weston and libweston. + for Weston and libweston. For Weston's x.y.0 releases, if libweston_major_version is greater than weston_major_version, bump the Weston version numbers (major, minor, micro) to match the libweston version numbers (major, minor, patch). - Additionally for all Weston releases, if libweston version - major.minor.patch is less than Weston version major.minor.micro, bump - libweston version numbers to match the Weston version numbers. + Additionally for all Weston releases, if libweston's + major.minor.patch version is less than Weston's major.minor.micro + version, bump libweston version numbers to match the Weston + version numbers. Weston releases are made with the Weston version number, not with the libweston version number. @@ -61,12 +62,11 @@ To make a release of Weston and/or Wayland, follow these steps. $ release.sh . - For wayland, also publish the publican documentation to + For Wayland, also publish the publican documentation to wayland.freedesktop.org: $ ./publish-doc - 5. Compose the release announcements. The script will generate *.x.y.z.announce files with a list of changes and tags, one for wayland, one for weston. Prepend these with a human-readable @@ -104,10 +104,10 @@ development early). $ git branch x.y [sha] $ git push origin x.y -The master branch configure.ac version should always be (at least) -x.y.90, with x.y being the most recent stable branch. Stable branch -configure version is just whatever was most recently released from -that branch. +The master branch's configure.ac version should always be (at least) +x.y.90, with x.y being the most recent stable branch. The stable +branch's configure.ac version is just whatever was most recently +released from that branch. For stable branches, we commit fixes to master first, then cherry-pick them back to the stable branch. |