From deb0d5b2e51426df43a463f284590b8060ea1c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <my-git-mail@normanjaeckel.de>
Date: Sat, 5 Jan 2013 23:20:38 +0100
Subject: [PATCH 1/2] Some fixes. Update requirements.txt and setup.py.

---
 .travis.yml               | 2 +-
 INSTALL.txt               | 6 +++++-
 openslides/utils/views.py | 2 +-
 requirements.txt          | 6 +++---
 setup.py                  | 5 +----
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ade84bd88..3f9a362aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ python:
   - "2.6"
   - "2.7"
 install:
-  - easy_install https://www.djangoproject.com/download/1.5b2/tarball/
+  - easy_install https://www.djangoproject.com/download/1.5c1/tarball/
   - pip install -r requirements.txt --use-mirrors
   - python extras/scripts/create_local_settings.py
 script:
diff --git a/INSTALL.txt b/INSTALL.txt
index 739431350..4f3c5e6a0 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -18,7 +18,11 @@ I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
   1. Check requirements:
 
         Make sure that you have installed Python Programming Language 2
-        (>= 2.6) on your system.
+        (>= 2.6) on your system. You will also need the Python
+        development headers.
+
+        E. g. for Ubuntu run:
+        $ sudo apt-get install python-dev
 
   2. Setup a virtual environment with virtualenv (optional):
 
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index 603786370..88e199c07 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -260,7 +260,7 @@ class CreateView(PermissionMixin, _CreateView):
             return self.apply_url
         else:
             raise ImproperlyConfigured(
-                "No URL to redirect to. Provide a apply_url.")
+                'No URL to redirect to. Please provide an apply_url.')
 
     def form_invalid(self, form):
         messages.error(self.request, _('Please check the form for errors.'))
diff --git a/requirements.txt b/requirements.txt
index 8602f17e8..bb138df37 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
-Django==1.5b2
+Django==1.5
 django-mptt==0.5.5
 reportlab==2.6
 PIL==1.1.7
-coverage==3.6b1
+coverage==3.6b3
 django-discover-runner==0.2.2
-pep8==1.3.3
+pep8==1.4
diff --git a/setup.py b/setup.py
index c283ec9aa..c6b32c729 100644
--- a/setup.py
+++ b/setup.py
@@ -7,9 +7,6 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-# for python 2.5 support
-from __future__ import with_statement
-
 from setuptools import setup
 from setuptools import find_packages
 from openslides import get_version
@@ -43,7 +40,7 @@ setup(
         'versiontools >= 1.6',
     ],
     install_requires=[
-        'django >= 1.4',
+        'django >= 1.5',
         'django-mptt',
         'reportlab',
         'pil',

From d5cbf80bf54b990abc262b4ed65fd6a913f19d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <my-git-mail@normanjaeckel.de>
Date: Sun, 6 Jan 2013 00:33:03 +0100
Subject: [PATCH 2/2] Set to Django 1.5c1

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index bb138df37..8e6d80b8f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django==1.5
+Django==1.5c1
 django-mptt==0.5.5
 reportlab==2.6
 PIL==1.1.7