Merge branch 'master' of ssh://git.csx.cam.ac.uk/raven/django-ucamwebauth

Conflicts:
	debian/changelog
	setup.py

CHANGELOG

@@ -4,7 +4,9 @@ django-ucamwebauth changelog
 1.2 - 10/0802014
 ------------------
 
-- UCAMWEBAUTH_CREATE_USE is now by default True
+- UCAMWEBAUTH_CREATE_USE is now by default True. Empty database with default to False cause automatic redirect to
+    log out and very few people will use the False option to only let users in if they are already present in the
+    database.
 
 
 1.1 - 19/08/2014

debian/changelog

 django-ucamwebauth (1.2) unstable; urgency=low
 
   * New upstream release
+  * UCAMWEBAUTH_CREATE_USE is now by default True. Empty database with default to False cause automatic redirect to
+    log out and very few people will use the False option to only let users in if they are already present in the
+    database.
 
  -- Abraham Martin <amc203@cam.ac.uk>  Wed, 10 Sep 2014 10:30:23 +0100
 
+django-ucamwebauth (1.1) unstable; urgency=low
+
+  [ Ben Harris ]
+  * Quote and unquote elements of requests and responses more correctly.
+  * Add build-dependency on python-markdown.
+  * Re-work RavenAuthBackend to inherit from RemoteUserBackend.
+  [ Abraham Martin ]
+  * new travis conf
+  * Python 3 compatibility
+
 django-ucamwebauth (1.0) unstable; urgency=low
 
   [Abraham Martin]

debian/control

@@ -10,7 +10,7 @@ Standards-Version: 3.9.4
 
 Package: python-django-ucamwebauth
 Architecture: all
-Depends: python-django (>=1.6), python-requests, python-openssl, ${misc:Depends}, ${python:Depends}
+Depends: python-django (>=1.6), python-requests, python-openssl (>= 0.11~), ${misc:Depends}, ${python:Depends}
 Description: University of Cambridge Web Authentication module for Django
  This package provides a django authentication back-end to the
  University of Cambridge Web Authentication system.

django-ucamwebauth.spec

 Name: django-ucamwebauth
-Version: 1.0
-Release: 0.1
+Version: 1.2
+Release: 1
 Summary: University of Cambridge Web Authentication module for Django
 Source: %{name}-%{version}.tar.gz
 Group: Unknown
@@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 BuildRequires: python-setuptools
 
-Requires: python-Django >= 1.6 python-openssl
+Requires: python-Django >= 1.6 python-openssl >= 0.11
 
 %Description
 This package provides a django authentication back-end to the

setup.py

@@ -8,6 +8,8 @@ setup(
     description='A Django authentication backend for Ucam-WebAuth a.k.a. Raven',
     long_description=open('README.rst').read(),
     url='https://git.csx.cam.ac.uk/x/ucs/raven/django-ucamwebauth.git',
+    # When changing this version number, remember to update
+    # django-ucamwebauth.spec and debian/changelog.
     version='1.2',
     license='MIT',
     author='Information Systems Group, University Information Services, University of Cambridge',