diff --git a/GIT_BRANCHES.TXT b/GIT_BRANCHES.TXT index 08b9880..00c0d21 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,9 +12,17 @@ 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. -- 14.1-mate-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 previously 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 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. @@ -26,6 +34,7 @@ $ git branch 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 @@ -36,6 +45,7 @@ To switch to another branch, use 'git checkout '. Example: $ git checkout 14.1-mate-1.6 $ git branch + 1.6 * 14.1-mate-1.6 master diff --git a/README.TXT b/README.TXT index e4886a2..617a276 100644 --- a/README.TXT +++ b/README.TXT @@ -13,10 +13,10 @@ initial Git repo, you will be using 'master' branch which will build the development branch of MATE 1.7. Building from the development branch is not supported and may or may not work at any given moment. Most users will want to build from the stable branch which is MATE version 1.6, released on April -2, 2013. Checkout that branch using 'git checkout current-mate-1.6' to build +2, 2013. Checkout that branch using 'git checkout 14.1-mate-1.6' to build from the stable MSB branch. -The rest of this README.TXT is specific to building from 'current-mate-1.6' branch. +The rest of this README.TXT is specific to building from '14.1-mate-1.6' branch. How to build and install the MATE packages using these scripts: 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