Documentation: add missing dependancies - fix media file migration

1 files changed, 24 insertions, 19 deletions

diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 2b87cd3..9f36eb4 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -28,15 +28,15 @@ The instruction are given for Debian Squeeze and Debian Wheezy.
 Get new version of dependencies
 -------------------------------
 
-From version 1.1 -> 1.2
-***********************
+Version 1.1 -> 1.2
+******************
 
 .. code-block:: bash
 
-    apt-get install python-lxml libjs-jquery gpsbabel
+    apt-get install python-lxml libjs-jquery gpsbabel python-gdal
 
-From version 1.2 to 2.0
-***********************
+Version 1.2 -> 2.0
+******************
 
 Debian Squeeze
 ++++++++++++++
@@ -44,7 +44,7 @@ Activate the backports: http://backports-master.debian.org/Instructions/
 Then install the new dependencies::
 
     apt-get install -t squeeze-backports python-django python-django-south \
-            python-simplejson
+            python-simplejson libjs-jquery-ui
 
 Debian Wheezy
 +++++++++++++
@@ -91,6 +91,7 @@ From a previous Git installation
 
     cd $CHIMERE_PATH
     git checkout -b $CHIMERE_LOCALNAME # do it only if you haven't yet create a local branch
+    git stash # if you have uncommited changes
     git checkout master
     git pull
     git checkout $CHIMERE_LOCALNAME
@@ -141,6 +142,7 @@ Create a new project template.
 
 .. code-block:: bash
 
+    cd $CHIMERE_PATH
     cp -ra $CHIMERE_PATH/example_project $CHIMERE_LOCALNAME
     CHIMERE_APP_PATH=$CHIMERE_PATH/$CHIMERE_LOCALNAME
 
@@ -165,15 +167,11 @@ Logging is now enabled by default in the file */var/log/django/chimere.log*.
 .. code-block:: bash
 
     mkdir /var/log/django
+    touch /var/log/django/chimere.log
     chown www-data -R /var/log/django
 
 Static files
 ............
-Move old static files to the new static directory.
-
-.. code-block:: bash
-
-    cp -ra $CHIMERE_PATH/chimere/static/* $CHIMERE_APP_PATH/static/
 
 Now static file are managed with *django.contrib.staticfiles*.
 
@@ -182,6 +180,14 @@ Now static file are managed with *django.contrib.staticfiles*.
     cd $CHIMERE_APP_PATH
     ./manage.py collectstatic
 
+Move old static files to the new static directory.
+
+.. code-block:: bash
+
+    cp -ra $CHIMERE_PATH/chimere/static/* $CHIMERE_APP_PATH/static/
+    cp -ra $CHIMERE_PATH/chimere/static/icons/* $CHIMERE_APP_PATH/media/icons/
+    cp -ra $CHIMERE_PATH/chimere/static/upload $CHIMERE_APP_PATH/media/
+
 Webserver configuration
 .......................
 If you are using Apache and WSGI to serve your Chimère, change your WSGI
@@ -205,8 +211,8 @@ Update settings and static files.
 Migrate database
 ----------------
 
-From version prior to 1.2 to 1.2
-********************************
+Version 1.1 -> 1.2
+******************
 
 Migration scripts test your installation before making changes so you probably
 won't have any lost but by precaution before running theses scripts don't forget
@@ -229,19 +235,18 @@ After that in the chimere directory just execute the script.
 .. code-block:: bash
 
     cd $CHIMERE_APP_PATH
-    python ./scripts/upgrade
+    python ./scripts/upgrade.py
 
-From 1.2 to 2.0
-***************
+Version 1.2 -> 2.0
+******************
 
-Django South is now used to manage database migrations. Add **south** to your 
-*INSTALLED_APPS* list in *settings.py* and run.
+Django South is now used to manage database migrations.
 
 .. code-block:: bash
 
     cd $CHIMERE_APP_PATH
     ./manage.py syncdb
-    ./manage.py migrate chimere 0001 --fake
+    ./manage.py migrate chimere 0001 --fake # fake the database initialisation
     ./manage.py migrate chimere
 
 A description field is now available for markers. If you would like to move