From ea982bf73e4b1510c1db4fc2fe25b8e79e04feed Mon Sep 17 00:00:00 2001
From: fonfon <blubb@fonfon.at>
Date: Wed, 1 Oct 2014 16:42:09 +0200
Subject: [PATCH] call django.setup before syncdb for django 1.7 compatibility

---
 INSTALL            | 2 +-
 plinth/__main__.py | 1 +
 setup.py           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index 369395b78..48bd5a690 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@
 
     On a Debian based system, run:
 
-    $ sudo apt-get install libjs-jquery libjs-modernizer \
+    $ sudo apt-get install libjs-jquery libjs-modernizr \
     libjs-twitter-bootstrap make pandoc python3 python3-cherrypy3 \
     python3-django python3-bootstrapform
 
diff --git a/plinth/__main__.py b/plinth/__main__.py
index c287edc3e..8c31288a1 100644
--- a/plinth/__main__.py
+++ b/plinth/__main__.py
@@ -195,6 +195,7 @@ def configure_django():
         STATIC_URL='/'.join([cfg.server_dir, 'static/']).replace('//', '/'),
         TEMPLATE_CONTEXT_PROCESSORS=context_processors,
         TEMPLATE_DIRS=template_directories)
+    django.setup()
 
     LOGGER.info('Configured Django')
     LOGGER.info('Template directories - %s', template_directories)
diff --git a/setup.py b/setup.py
index 9dc9df8e6..263c7d301 100755
--- a/setup.py
+++ b/setup.py
@@ -90,7 +90,7 @@ setup(
     ],
     install_requires=[
         'cherrypy >= 3.0',
-        'django >= 1.6.0',
+        'django >= 1.7.0',
         'django-bootstrap-form'
     ],
     package_data={'plinth': ['modules/enabled/*',