[Python-modules-commits] r21311 - in packages/django-openid-auth/trunk/debian (5 files)

[fladi-guest at users.alioth.debian.org]

    Date: Friday, April 20, 2012 @ 10:43:11
  Author: fladi-guest
Revision: 21311

Fix FTBFS with django (>= 1.4) (Closes: #669482).

Added:
  packages/django-openid-auth/trunk/debian/patches/
  packages/django-openid-auth/trunk/debian/patches/fix_settings_database.patch
  packages/django-openid-auth/trunk/debian/patches/series
Modified:
  packages/django-openid-auth/trunk/debian/changelog
  packages/django-openid-auth/trunk/debian/control

Modified: packages/django-openid-auth/trunk/debian/changelog
===================================================================
--- packages/django-openid-auth/trunk/debian/changelog	2012-04-20 10:21:41 UTC (rev 21310)
+++ packages/django-openid-auth/trunk/debian/changelog	2012-04-20 10:43:11 UTC (rev 21311)
@@ -1,8 +1,11 @@
 django-openid-auth (0.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Fix tests for django (>= 1.4) FTBFS (Closes: #669482).
+    - Add patch for Django 1.3 style DATABASE configuration
+    - Bump BD on python-django to (>= 1.3) because of new configuration
 
- -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 20 Apr 2012 12:20:53 +0200
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 20 Apr 2012 12:21:54 +0200
 
 django-openid-auth (0.3-3) UNRELEASED; urgency=low
 

Modified: packages/django-openid-auth/trunk/debian/control
===================================================================
--- packages/django-openid-auth/trunk/debian/control	2012-04-20 10:21:41 UTC (rev 21310)
+++ packages/django-openid-auth/trunk/debian/control	2012-04-20 10:43:11 UTC (rev 21311)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
 Build-Depends: debhelper (>= 7.3.7~), python-all (>= 2.5), python-support, 
- python-django (>= 1.2), python-openid
+ python-django (>= 1.3), python-openid
 Standards-Version: 3.9.3
 XS-Python-Version: >= 2.5
 Homepage: https://launchpad.net/django-openid-auth

Added: packages/django-openid-auth/trunk/debian/patches/fix_settings_database.patch
===================================================================
--- packages/django-openid-auth/trunk/debian/patches/fix_settings_database.patch	                        (rev 0)
+++ packages/django-openid-auth/trunk/debian/patches/fix_settings_database.patch	2012-04-20 10:43:11 UTC (rev 21311)
@@ -0,0 +1,42 @@
+Description: Use Django 1.3 DATABASE structure
+ Upstream still ships the old database configuration for Django in its 
+ example consumer. This patch changes it to the new dictionary structure.
+Author: Michael Fladischer <FladischerMichael at fladi.at>
+Last-Update: 2012-04-20
+Forwarded: no
+
+--- a/example_consumer/settings.py
++++ b/example_consumer/settings.py
+@@ -38,12 +38,13 @@
+ 
+ MANAGERS = ADMINS
+ 
+-DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
+-DATABASE_NAME = 'sqlite.db'             # Or path to database file if using sqlite3.
+-DATABASE_USER = ''             # Not used with sqlite3.
+-DATABASE_PASSWORD = ''         # Not used with sqlite3.
+-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
+-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
++DATABASES = {
++    'default': {
++        'ENGINE': 'django.db.backends.sqlite3',
++        'NAME': 'example_consumer/test.db3',
++    }
++}
++
+ 
+ # Local time zone for this installation. Choices can be found here:
+ # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
+@@ -81,9 +82,9 @@
+ 
+ # List of callables that know how to import templates from various sources.
+ TEMPLATE_LOADERS = (
+-    'django.template.loaders.filesystem.load_template_source',
+-    'django.template.loaders.app_directories.load_template_source',
+-#     'django.template.loaders.eggs.load_template_source',
++    'django.template.loaders.filesystem.Loader',
++    'django.template.loaders.app_directories.Loader',
++#    'django.template.loaders.eggs.Loader',
+ )
+ 
+ # django-openid-auth will *not* work with Django 1.1.1 or older, as it's

Added: packages/django-openid-auth/trunk/debian/patches/series
===================================================================
--- packages/django-openid-auth/trunk/debian/patches/series	                        (rev 0)
+++ packages/django-openid-auth/trunk/debian/patches/series	2012-04-20 10:43:11 UTC (rev 21311)
@@ -0,0 +1 @@
+fix_settings_database.patch