From b4e983e433f291a80c389655c4488258f4af4d37 Mon Sep 17 00:00:00 2001 From: Chess Griffin Date: Sun, 2 Mar 2014 17:11:54 -0500 Subject: [PATCH] minor whitespace and formatting tweaks to docs Signed-off-by: Chess Griffin --- CURRENT.TXT | 8 +++--- GIT_BRANCHES.TXT | 19 +++++++------ KNOWN_ISSUES.TXT | 38 +++++++++++++------------ MATE-1.8-CHANGES.TXT | 3 +- MATE-1.8-DEPS.TXT | 5 ++-- README.TXT | 67 +++++++++++++++++++++++--------------------- UPGRADE.TXT | 45 +++++++++++++++-------------- 7 files changed, 98 insertions(+), 87 deletions(-) diff --git a/CURRENT.TXT b/CURRENT.TXT index 5cabd87..f22014f 100644 --- a/CURRENT.TXT +++ b/CURRENT.TXT @@ -7,10 +7,10 @@ is already available on Slackware since 14.1, so there is no need to build itstool if you are using Slackware -current. Tue Jun 11 00:41:15 UTC 2013 -Pat has rebuilt xdg-utils in Slackware 14.1 to properly support MATE DE, -so xdg-utils patch is no longer needed in Slackware -current, but running -these two commands as normal user are still needed to set caja as the default -handler: +Pat has rebuilt xdg-utils in Slackware 14.1 to properly support MATE DE, so +xdg-utils patch is no longer needed in Slackware -current, but running +these two commands as normal user are still needed to set caja as the +default handler: xdg-mime default caja-folder-handler.desktop inode/directory xdg-mime default caja-folder-handler.desktop application/x-directory diff --git a/GIT_BRANCHES.TXT b/GIT_BRANCHES.TXT index 87d6202..87a8df0 100644 --- a/GIT_BRANCHES.TXT +++ b/GIT_BRANCHES.TXT @@ -12,18 +12,18 @@ Currently, there are three branches in the MSB GIT repository: will come from. Please use this branch for testing only and not for production environments. -- 14.0-mate-1.6: The MSB stable branch for Slackware 14.0. - This is the previously supported branch and only receives bug fix updates. - The MSB 1.6 binary packages for Slackware 14.0 were built from this branch. +- 14.0-mate-1.6: The MSB stable branch for Slackware 14.0. This is the + previously supported branch and only receives bug fix updates. The MSB + 1.6 binary packages for Slackware 14.0 were built from this branch. Since Slackware 14.1 has been declared as the next stable release then this branch is considered obsoleted and no longer updated. - 14.1-mate-1.6: The MSB stable branch for Slackware 14.1. - This is the previously supported branch and only receives bug fix updates. - The MSB 1.6 binary packages for Slackware 14.1 are built from this branch. - You might want to use this branch if you enjoy stable releases. - Since MATE 1.8 has been released as the next stable release then - this branch is considered obsoleted and no longer updated. + This is the previously supported branch and only receives bug fix + updates. The MSB 1.6 binary packages for Slackware 14.1 are built from + this branch. You might want to use this branch if you enjoy stable + releases. Since MATE 1.8 has been released as the next stable release + then this branch is considered obsoleted and no longer updated. - 14.1-mate-1.8: The MSB stable branch for Slackware 14.1. This is the currently supported branch and only receives bug fix updates. @@ -55,4 +55,5 @@ $ git branch * 14.1-mate-1.8 master -You have now switched from the 'master' branch to the '14.1-mate-1.8' branch. +You have now switched from the 'master' branch to the '14.1-mate-1.8' +branch. diff --git a/KNOWN_ISSUES.TXT b/KNOWN_ISSUES.TXT index 7be54f8..f685a1c 100644 --- a/KNOWN_ISSUES.TXT +++ b/KNOWN_ISSUES.TXT @@ -1,8 +1,9 @@ The following is a list of known issues with MATE on Slackware: Mon Feb 17 02:02:11 UTC 2014 -If you start MATE Volume Control in Applications > Sounds & Videos, sometimes, you will -find this error message "no volume control gstreamer plugins and/or devices found". +If you start MATE Volume Control in Applications > Sounds & Videos, +sometimes, you will find this error message "no volume control gstreamer +plugins and/or devices found". You can fix this by running these steps: - Go to System > Preferences > KDE System Settings > Multimedia @@ -12,12 +13,13 @@ You can fix this by running these steps: MATE Volume Control should be working now Sat Feb 15 01:01:47 UTC 2014 -Help menus and help buttons are disabled since they require yelp which requires -more dependencies. For those interested to build yelp, you may find the SlackBuild -in testing/yelp. +Help menus and help buttons are disabled since they require yelp which +requires more dependencies. For those interested to build yelp, you may +find the SlackBuild in testing/yelp. -You also need to rebuild some packages, since by default, the SlackBuild script is configured -to remove help files. You can remove the --without-help-dir line to produce help files. +You also need to rebuild some packages, since by default, the SlackBuild +script is configured to remove help files. You can remove the +--without-help-dir line to produce help files. Mon Jun 10 03:09:28 UTC 2013 If you are encountering problems with Caja (MATE's file manager) opening @@ -33,8 +35,8 @@ xdg-mime default caja-folder-handler.desktop application/x-directory You should be all set. Thanks to Totoro-kun and T3slider for reporting and discussing this in the LQ forums and also thanks to Giorgos Keramidas for -creating the initial patch. Here is a link to the LQ thread which also has a -link to Giorgos's blog with the patch: +creating the initial patch. Here is a link to the LQ thread which also has +a link to Giorgos's blog with the patch: http://www.linuxquestions.org/questions/showthread.php?p=4968614 @@ -45,14 +47,14 @@ is to change it into TwinView in your xorg.conf Sun Mar 24 02:47:56 UTC 2013 If you run into strange panel issues, or missing icons, or theme problems, -please consider backing up or clearing out some of the hidden directories in -your $HOME, like $HOME/.config and $HOME/.cache and $HOME/.local. If you -switch back and forth between different desktop environments, sometimes those -settings can get polluted. You can also try to remove/rename your .gtkrc-2.0 if -it does exists on your home directory. +please consider backing up or clearing out some of the hidden directories +in your $HOME, like $HOME/.config and $HOME/.cache and $HOME/.local. If +you switch back and forth between different desktop environments, sometimes +those settings can get polluted. You can also try to remove/rename your +.gtkrc-2.0 if it does exists on your home directory. Fri Mar 22 16:43:36 UTC 2013 -Working to determine whether mate-polkit is necessary. According to upstream, -it is, although it results in duplicative polkit actions when a USB stick is -inserted, for example. Disabling polkit-gnome in the "Startup Applications" -is a workaround until more testing is done. +Working to determine whether mate-polkit is necessary. According to +upstream, it is, although it results in duplicative polkit actions when a +USB stick is inserted, for example. Disabling polkit-gnome in the "Startup +Applications" is a workaround until more testing is done. diff --git a/MATE-1.8-CHANGES.TXT b/MATE-1.8-CHANGES.TXT index aa79c1f..1c8e625 100644 --- a/MATE-1.8-CHANGES.TXT +++ b/MATE-1.8-CHANGES.TXT @@ -35,4 +35,5 @@ Note: To enable side-by-side tiling via command line, run this command $ dconf write org/mate/marco/general/side-by-side-tiling true -or you can enable it via System > MATE Control Center > Windows > Enable side by side tilling +or you can enable it via System > MATE Control Center > Windows > Enable +side by side tilling diff --git a/MATE-1.8-DEPS.TXT b/MATE-1.8-DEPS.TXT index 9b44ca6..e653573 100644 --- a/MATE-1.8-DEPS.TXT +++ b/MATE-1.8-DEPS.TXT @@ -1,6 +1,7 @@ This is a list of dependencies for the packages in the /extra directory. -1. extra/mate-applets require deps/pygobject3, deps/libgtop, and deps/gtksourceview +1. extra/mate-applets require deps/pygobject3, deps/libgtop, and + deps/gtksourceview 2. extra/caja-extensions requires deps/gssdp and deps/gupnp @@ -13,5 +14,5 @@ This is a list of dependencies for the packages in the /extra directory. 6. extra/mate-system-tools requires deps/perl-xml-twig, deps/perl-net-dbus, deps/system-tools-backends, and deps/liboobs. - + 7. extra/pluma requires both deps/gtksourceview and deps/pygtksourceview diff --git a/README.TXT b/README.TXT index 810de01..595c5e5 100644 --- a/README.TXT +++ b/README.TXT @@ -1,35 +1,36 @@ MATE SlackBuilds ================ -This project provides SlackBuild scripts to build and install the MATE desktop -environment on Slackware (http://www.mate-desktop.org). Please check the main -project website at http://mateslackbuilds.github.io for screenshots and more -information. There is also a link to MATE 1.8 binary packages for -Slackware 14.1 and also MATE 1.6 for Slackware 14.0 and 14.1. +This project provides SlackBuild scripts to build and install the MATE +desktop environment on Slackware (http://www.mate-desktop.org). Please +check the main project website at http://mateslackbuilds.github.io for +screenshots and more information. There is also a link to MATE 1.8 binary +packages for Slackware 14.1 and also MATE 1.6 for Slackware 14.0 and 14.1. -Please read GIT_BRANCHES.TXT to make sure you are on the right branch of the -MSB repo before attempting to build from the scripts. After cloning the -initial Git repo, you will be using 'master' branch which will build the -development branch for MATE desktop. 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.8, released on March 2014. -Checkout that branch using 'git checkout 14.1-mate-1.8' to build from the -stable MSB branch. +Please read GIT_BRANCHES.TXT to make sure you are on the right branch of +the MSB repo before attempting to build from the scripts. After cloning +the initial Git repo, you will be using 'master' branch which will build +the development branch for MATE desktop. 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.8, +released on March 2014. Checkout that branch using 'git checkout +14.1-mate-1.8' to build from the stable MSB branch. -The rest of this README.TXT is specific to building from the 'master' branch. +The rest of this README.TXT is specific to building from the 'master' +branch. How to build and install the MATE packages using these scripts: 1. Clone the Git repo or download a tarball/zip of the repo. 2. 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. 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.8 and the download locations for each -dependency and put each source into the corresponding directory within 'base' -and 'deps'. +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. 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.8 and the download +locations for each dependency and put each source into the corresponding +directory within 'base' and 'deps'. 3. 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 @@ -37,17 +38,17 @@ directory. If you want to build and install them all, then you can use the into the directory of whatever package you want in /extra and run the SlackBuild. As with 'base', each SlackBuild will download the source. -4. 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. 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. -5. 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 -polkit-gnome and see if polkit-mate works by itself. Also, if you use -mate-power-manager from /extra then you might want to disable the Xfce power -manager if it is listed. +5. 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 polkit-gnome and see if polkit-mate works by itself. +Also, if you use mate-power-manager from /extra then you might want to +disable the Xfce power manager if it is listed. 6. 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 @@ -55,5 +56,7 @@ 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. -7. Enjoy and let us know of any issues. Email is: mateslackbuilds@gmail.com. +7. Enjoy and let us know of any issues. Email is: +mateslackbuilds@gmail.com. + Thanks! diff --git a/UPGRADE.TXT b/UPGRADE.TXT index 4887d34..2e8fea6 100644 --- a/UPGRADE.TXT +++ b/UPGRADE.TXT @@ -1,18 +1,20 @@ MATE 1.6 to 1.8 Upgrade HOWTO -This document explains how to upgrade from MATE 1.6 to 1.8 in Slackware 14.1. +This document explains how to upgrade from MATE 1.6 to 1.8 in Slackware +14.1. ---------------------------------------------------------------------------- -Before you begin, I would strongly recommend making a backup of your -system, or, if not the entire system, at least the /etc and your home directory. -You might find that you need to refer to a few things after the upgrade -process is complete. Back it up, or take your chances. +Before you begin, we strongly recommend making a backup of your system, or, +if not the entire system, at least the /etc and your home directory. You +might find that you need to refer to a few things after the upgrade process +is complete. Back it up, or take your chances. OK, now that everything is safely backed up, let's proceed. :-) -To do this, you'll need the MATE 1.8 packages ready in your local system. Grab it -from official repository at http://www.slackware.org.uk/msb/ or any other mirror sites. +To do this, you'll need the MATE 1.8 packages ready in your local system. +Grab it from official repository at http://www.slackware.org.uk/msb/ or any +other mirror sites. 0. log out from MATE Desktop @@ -22,8 +24,8 @@ from official repository at http://www.slackware.org.uk/msb/ or any other mirror upgradepkg --install-new --reinstall /path/to/extra/*.txz 2. Remove obsolete packages - - removepkg mate-file-manager-gksu + + removepkg mate-file-manager-gksu removepkg mate-file-manager-image-converter removepkg mate-file-manager-open-terminal removepkg mate-file-manager-sendto @@ -44,29 +46,30 @@ from official repository at http://www.slackware.org.uk/msb/ or any other mirror removepkg mate-menu-editor removepkg mate-text-editor - You will notice that some of the files are found on other packages and it will not be deleted. - That's fine, since these packages gets a new name on MATE 1.8 (see MATE-1.8-CHANGES.TXT). + You will notice that some of the files are found on other packages and + it will not be deleted. That's fine, since these packages gets a new + name on MATE 1.8 (see MATE-1.8-CHANGES.TXT). 4. Remove PAM-related packages (optional) - If you happened to install pam/pam_unix2 packages in MATE 1.6 to get mate-screensaver working - for desktop locking feature, you will be glad to know that mate-screensaver is now moved to - extra and without the need of pam and pam_unix2 libraries anymore. - So these two packages can be safely deleted. + If you happened to install pam/pam_unix2 packages in MATE 1.6 to get + mate-screensaver working for desktop locking feature, you will be glad + to know that mate-screensaver is now moved to extra and without the + need of pam and pam_unix2 libraries anymore. So these two packages can + be safely deleted. removepkg pam removepkg pam_unix2 -5. run xwmconfig and select xinitrc.mate-session - This ensures you get the latest copy of xinitrc.mate-session due to changes in mate-session-manager - ALWAYS run this command for both new installation or upgrade from MATE 1.6 +5. run xwmconfig and select xinitrc.mate-session This ensures you get the + latest copy of xinitrc.mate-session due to changes in mate-session- + manager. ALWAYS run this command for both new installations or upgrades + from MATE 1.6 At this point you should be running MATE 1.8 on Slackware 14.1. :-) -I wish everyone good luck with this! +We wish everyone good luck with this! --- Chess Griffin Willy Sudiarto Raharjo - -