From a73b0b1716a4804fc1b7e2bfaf667a40e0621033 Mon Sep 17 00:00:00 2001 From: vuLgAr Date: Fri, 26 Aug 2011 06:40:00 +0200 Subject: [PATCH 1/2] Edited README via GitHub --- README | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/README b/README index 4e0dfc2e..f355ad87 100644 --- a/README +++ b/README @@ -14,11 +14,20 @@ Additional Arthur requirements: Django Jinja2 2.6 -Additional Graphing requirements: - numpy 1.1 - matplotlib 1.0 - libpng 1.1 (included in matplotlib Windows installer) - freetype 1.4 (included in matplotlib Windows installer) +Additional Graphing requirements: + numpy 1.1 + matplotlib 1.0 + +Additional Graphing requirements: ubuntu* + numpy + matplotlib (source) * http://matplotlib.sourceforge.net/faq/installing_faq.html#install-from-git + when installing from source you will need to manually create a few dir's these are - + /var/www/.matplotlib + /merlin/Arthur/graphs + you will also need to give them the correct permissions + so chmod 777 them both + + Setting up Git: (Consult Git's website for full instructions) 1) Navigate to the parent directory where you wish to install Merlin From 869ebe40d71444068357fff0eb2821ceb3abb7af Mon Sep 17 00:00:00 2001 From: vuLgAr Date: Fri, 26 Aug 2011 07:09:11 +0200 Subject: [PATCH 2/2] Edited README via GitHub --- README | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README b/README index f355ad87..d8e7745c 100644 --- a/README +++ b/README @@ -18,14 +18,13 @@ Additional Graphing requirements: numpy 1.1 matplotlib 1.0 -Additional Graphing requirements: ubuntu* - numpy +For Nix* you will need to compile: matplotlib (source) * http://matplotlib.sourceforge.net/faq/installing_faq.html#install-from-git - when installing from source you will need to manually create a few dir's these are - - /var/www/.matplotlib - /merlin/Arthur/graphs - you will also need to give them the correct permissions - so chmod 777 them both + +Then create these dir's and chmod 777 them both + /var/www/.matplotlib + /merlin/Arthur/graphs +