From a94296dd50d3c4b3b832dbee6c24f54f395100ad Mon Sep 17 00:00:00 2001 From: Chess Griffin Date: Tue, 16 Jul 2013 12:31:38 -0400 Subject: [PATCH] add GIT_BRANCHES.TXT; update README.TXT; update TREE.TXT Signed-off-by: Chess Griffin --- GIT_BRANCHES.TXT | 42 ++++++++++++++++++++++++++++++++++++++++++ README.TXT | 31 ++++++++++++++++++------------- TREE.TXT | 3 ++- 3 files changed, 62 insertions(+), 14 deletions(-) create mode 100644 GIT_BRANCHES.TXT diff --git a/GIT_BRANCHES.TXT b/GIT_BRANCHES.TXT new file mode 100644 index 0000000..43be4ab --- /dev/null +++ b/GIT_BRANCHES.TXT @@ -0,0 +1,42 @@ +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: + +- master: The MSB development branch. It represents the most up-to-date + code, but no binary packages are built from this branch. Building from + this branch may or may not work. This is where the next stable release + 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. + Once 'master' has been declaraed 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): + +# git branch + +An asterisk will appear in front of the branch you are currently in. +Example output of 'git branch': + + 1.6 +* master + +This output indicates that you are now in the 'master' branch. + +To switch to another branch, use 'git checkout '. Example: + +# git checkout 1.6 +# git branch + +* 1.6 + master + +You have now switched from the 'master' branch to the '1.6' branch. diff --git a/README.TXT b/README.TXT index 1263d31..1a23d4e 100644 --- a/README.TXT +++ b/README.TXT @@ -10,29 +10,34 @@ information. There is also a link there to some binary packages for Slackware How to build and install the MATE packages using these scripts: -1. Clone the Git repo or download a tarball/zip of the repo. Run the -'mate-build-base.sh' in the msb root directory which will build and install -all the base (required) packages, including necessary dependencies in the -/deps directory. There are a total of 24 packages and they do not replace any -stock Slackware packages. (If you are building on -current, then dconf is -already included in Slackware so you do not need the dconf here in the git -repo -- see CURRENT.TXT). The SlackBuilds will use wget to download the -sources. Or, you can also manually download the sources from: +1. Clone the Git repo or download a tarball/zip of the repo. + +2. Read GIT_BRANCHES.TXT to make sure you are on the right branch of the MSB +repo. The stable branch is '1.6'. Checkout that branch using 'git +checkout 1.6' to build from the stable branch. + +3. Run the 'mate-build-base.sh' in the msb root directory which will build +and install all the base (required) packages, including necessary dependencies +in the /deps directory. There are a total of 24 packages and they do not +replace any stock Slackware packages. (If you are building on -current, then +dconf is already included in Slackware so you do not need the dconf here in +the git repo -- see CURRENT.TXT). The SlackBuilds will use wget to download +the sources. Or, you can also manually download the sources from: http://pub.mate-desktop.org/releases/1.6/ and the download locations for each dependency and put each source into the corresponding directory within 'base' and 'deps'. -2. Optionally, build and install any of the extra packages in the /extra +4. Optionally, build and install any of the extra packages in the /extra directory. If you want to build and install them all, then you can use the 'mate-build-extra.sh' script in the msb root directory. Otherwise, just go into the directory of whatever package you want in /extra and run the SlackBuild. As with 'base', each SlackBuild will download the source. -3. Once the base packages are built and installed, plus any from /extra, you +5. Once the base packages are built and installed, plus any from /extra, you can use 'xwmconfig' to select the mate session. Or, if you use KDM, just log out and select MATE from the KDM session dialog. -4. Check the 'startup applications' because there might be some duplicate or +6. Check the 'startup applications' because there might be some duplicate or conflicting entries. For example, there will be an entry for polkit-mate and polkit-gnome, the result of which might be duplicate attempts at polkit actions when inserting a usb stick, for example. You may want to disable @@ -41,11 +46,11 @@ mate-power-manager from /extra then you might want to disable the Xfce power manager if it is listed. Same with mate-keyring from /extra - if you installed that, you might want to disable the gnome-keyring entries. -5. Users running Slackware{64}-Current are advised to read CURRENT.TXT. It +7. Users running Slackware{64}-Current are advised to read CURRENT.TXT. It should also be noted that the target system for MATE SlackBuilds is a full install of the latest official Slackware release. It might run on a less-than-full install and it might run on -current. Or, it might not. Neither of those are our official target systems. -6. Enjoy and let us know of any issues. Email is: mateslackbuilds@gmail.com. +8. Enjoy and let us know of any issues. Email is: mateslackbuilds@gmail.com. Thanks! diff --git a/TREE.TXT b/TREE.TXT index 43e3787..0ec8171 100644 --- a/TREE.TXT +++ b/TREE.TXT @@ -1,5 +1,6 @@ . |-- CURRENT.TXT +|-- GIT_BRANCHES.TXT |-- KNOWN_ISSUES.TXT |-- README.TXT |-- TODO.TXT @@ -234,4 +235,4 @@ `-- xdg-utils `-- xdg-open.patch -59 directories, 175 files +59 directories, 176 files