From dd4626cdf9953259dd7b3dc72394775842b5bf8e Mon Sep 17 00:00:00 2001 From: willysr Date: Tue, 1 Oct 2013 09:59:36 +0700 Subject: [PATCH] Update Documentation About GIT Branch for Stable Releases Signed-off-by: willysr --- GIT_BRANCHES.TXT | 19 +++++++++++++++---- TODO.TXT | 4 ---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/GIT_BRANCHES.TXT b/GIT_BRANCHES.TXT index 49d47c6..f363802 100644 --- a/GIT_BRANCHES.TXT +++ b/GIT_BRANCHES.TXT @@ -4,7 +4,7 @@ MATE SlackBuilds MSB will follow MATE's workflow on versioning and releases as described in MATE's wiki: http://wiki.mate-desktop.org/dev-doc. -Currently, there are two branches in the MSB GIT repository: +Currently, there are three branches in the MSB GIT repository: - master: The MSB development branch. It represents the most up-to-date code, but no binary packages are built from this branch. Building from @@ -12,12 +12,21 @@ Currently, there are two branches in the MSB GIT repository: will come from. Please use this branch for testing only and not for production environments. -- 1.6: The MSB stable branch. This is the supported branch and only - receives bug fix updates. The MSB binary packages are built from this - branch. You might want to use this branch if you enjoy stable releases. +- 1.6: The MSB stable branch for Slackware 14.0. + This is the currently supported branch and only receives bug fix updates. + The MSB binary packages for Slackware 14.0 are built from this branch. + You might want to use this branch if you enjoy stable releases. + Once Slackware 14.1 gets declared the next stable release then + this branch will be obsoleted and no longer updated. + +- 14.1-mate-1.6: The MSB stable branch for Slackware 14.1. + This is the next supported branch and only receives bug fix updates. + The MSB binary packages for Slackware 14.1 are built from this branch. + You might want to use this branch if you enjoy stable releases. Once 'master' has been declared the next stable release (e.g. 1.8) then this branch will be obsoleted and no longer updated. + An easy way to find out which branch are you in right now (once you have cloned the repo or pulled the latest updates): @@ -27,6 +36,7 @@ An asterisk will appear in front of the branch you are currently in. Example output of 'git branch': 1.6 + 14.1-mate-1.6 * master This output indicates that you are now in the 'master' branch. @@ -37,6 +47,7 @@ $ git checkout 1.6 $ git branch * 1.6 + 14.1-mate-1.6 master You have now switched from the 'master' branch to the '1.6' branch. diff --git a/TODO.TXT b/TODO.TXT index 45b8067..b6fd2aa 100644 --- a/TODO.TXT +++ b/TODO.TXT @@ -1,9 +1,5 @@ The following is list of to-do items for MATE on Slackware: -Wed Apr 3 14:26:41 UTC 2013 -Provide dependencies for testing/mate-system-monitor. For now, you can build -the needed packages from SBo. - Fri Mar 22 16:47:15 UTC 2013 Determine whether mate-polkit is really needed or whether MATE can rely on polkit-gnome which is installed by default in Slackware. This was discussed