Merge branch '0.23'

Conflicts:
	CHANGES

CHANGES

@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+0.23.4 (unreleased)
+-------------------
+
+**Bug fixes**
+
+* Fix massive upgrade bug, where new migrations were ignored. Due to migration
+  operation introduction in 0.22 installation script.
+
+
 0.23.3 (2014-06-18)
 -------------------
 

Makefile

@@ -97,8 +97,8 @@ serve:
 
 deploy:
 	bin/develop update -f
-	bin/django syncdb --noinput --migrate
 	bin/django collectstatic --clear --noinput --verbosity=0
+	bin/django syncdb --noinput --migrate
 	bin/django sync_translation_fields --noinput
 	bin/django update_translation_fields
 	bin/django update_permissions

install.sh

@@ -370,9 +370,9 @@ function geotrek_setup {
     freshinstall=true
     if [ ! -z $existing ] ; then
         freshinstall=false
-        if [ $existing \< "0.21" ]; then
+        if [ $existing \< "0.22" ]; then
             echo_warn "Geotrek $existing was detected."
-            echo_error "Geotrek 0.21+ is required."
+            echo_error "Geotrek 0.22+ is required."
             exit 7
         fi
     fi
@@ -444,13 +444,6 @@ function geotrek_setup {
         exit_error 3 "Could not setup python environment !"
     fi
 
-    if ! $freshinstall ; then
-        # In v0.22 we erased Django migrations
-        for app in authent common core infrastructure land maintenance trekking ; do
-            bin/django migrate geotrek.$app --delete-ghost-migrations --fake
-        done;
-    fi
-
     if $tests ; then
         # XXX: Why Django tests require the main database :( ?
         bin/django syncdb --noinput