[Python-modules-commits] r24944 - in packages/django-openid-auth/trunk/debian (6 files)
asb at users.alioth.debian.org
asb at users.alioth.debian.org
Mon Jun 24 21:52:01 UTC 2013
Date: Monday, June 24, 2013 @ 21:51:59
Author: asb
Revision: 24944
* New upstream release.
- Fixes FTBFS with Django 1.5 (Closes: #711366).
* Removed fix_settings_database.patch, fixed upstream.
* Bump Standards-Version to 3.9.4, no changes needed.
* debian/docs: Drop openid.txt, no longer exists.
* django1.5compat.patch: Update url tag in template to
fix test failure with Django 1.5.
* Add myself to Uploaders.
Added:
packages/django-openid-auth/trunk/debian/patches/django1.5compat.patch
Modified:
packages/django-openid-auth/trunk/debian/changelog
packages/django-openid-auth/trunk/debian/control
packages/django-openid-auth/trunk/debian/docs
packages/django-openid-auth/trunk/debian/patches/series
Deleted:
packages/django-openid-auth/trunk/debian/patches/fix_settings_database.patch
Modified: packages/django-openid-auth/trunk/debian/changelog
===================================================================
--- packages/django-openid-auth/trunk/debian/changelog 2013-06-24 21:40:28 UTC (rev 24943)
+++ packages/django-openid-auth/trunk/debian/changelog 2013-06-24 21:51:59 UTC (rev 24944)
@@ -1,4 +1,4 @@
-django-openid-auth (0.4-2) UNRELEASED; urgency=low
+django-openid-auth (0.5-1) UNRELEASED; urgency=low
[ Chris Johnston ]
* Replaces python-django-openid-auth to to remove the Ubuntu-only
@@ -7,8 +7,18 @@
[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 16:00:45 +0200
+ [ Andrew Starr-Bochicchio ]
+ * New upstream release.
+ - Fixes FTBFS with Django 1.5 (Closes: #711366).
+ * Removed fix_settings_database.patch, fixed upstream.
+ * Bump Standards-Version to 3.9.4, no changes needed.
+ * debian/docs: Drop openid.txt, no longer exists.
+ * django1.5compat.patch: Update url tag in template to
+ fix test failure with Django 1.5.
+ * Add myself to Uploaders.
+ -- Andrew Starr-Bochicchio <asb at debian.org> Mon, 24 Jun 2013 17:35:44 -0400
+
django-openid-auth (0.4-1) unstable; urgency=low
* New upstream release.
Modified: packages/django-openid-auth/trunk/debian/control
===================================================================
--- packages/django-openid-auth/trunk/debian/control 2013-06-24 21:40:28 UTC (rev 24943)
+++ packages/django-openid-auth/trunk/debian/control 2013-06-24 21:51:59 UTC (rev 24944)
@@ -2,13 +2,14 @@
Section: python
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
+Uploaders: Michael Fladischer <FladischerMichael at fladi.at>,
+ Andrew Starr-Bochicchio <asb at debian.org>
Build-Depends: debhelper (>= 7.3.7~),
python-all (>= 2.6),
python-django (>= 1.2),
python-openid,
python-support
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
XS-Python-Version: >= 2.6
Homepage: https://launchpad.net/django-openid-auth
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-openid-auth/trunk/
Modified: packages/django-openid-auth/trunk/debian/docs
===================================================================
--- packages/django-openid-auth/trunk/debian/docs 2013-06-24 21:40:28 UTC (rev 24943)
+++ packages/django-openid-auth/trunk/debian/docs 2013-06-24 21:51:59 UTC (rev 24944)
@@ -1,3 +1,2 @@
README.txt
TODO.txt
-openid.txt
Added: packages/django-openid-auth/trunk/debian/patches/django1.5compat.patch
===================================================================
--- packages/django-openid-auth/trunk/debian/patches/django1.5compat.patch (rev 0)
+++ packages/django-openid-auth/trunk/debian/patches/django1.5compat.patch 2013-06-24 21:51:59 UTC (rev 24944)
@@ -0,0 +1,20 @@
+Description: Update template for Django 1.5
+Origin: commit, revision id: a.starr.b at gmail.com-20130618162848-teldgqvdg3w634dr
+Author: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
+Last-Update: 2013-06-18
+X-Bzr-Revision-Id: a.starr.b at gmail.com-20130618162848-teldgqvdg3w634dr
+Bug: https://bugs.launchpad.net/django-openid-auth/+bug/1170355
+
+=== modified file 'django_openid_auth/templates/openid/login.html'
+--- old/django_openid_auth/templates/openid/login.html 2010-12-03 00:46:25 +0000
++++ new/django_openid_auth/templates/openid/login.html 2013-06-18 16:28:48 +0000
+@@ -5,7 +5,7 @@
+ <title>Sign in with your OpenID</title>
+ <style type="text/css">
+ input.openid {
+- background: url({% url openid-logo %}) no-repeat;
++ background: url({% url 'openid-logo' %}) no-repeat;
+ background-position: 0 50%;
+ padding-left: 16px;
+ }
+
Deleted: packages/django-openid-auth/trunk/debian/patches/fix_settings_database.patch
===================================================================
--- packages/django-openid-auth/trunk/debian/patches/fix_settings_database.patch 2013-06-24 21:40:28 UTC (rev 24943)
+++ packages/django-openid-auth/trunk/debian/patches/fix_settings_database.patch 2013-06-24 21:51:59 UTC (rev 24944)
@@ -1,42 +0,0 @@
-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
Modified: packages/django-openid-auth/trunk/debian/patches/series
===================================================================
--- packages/django-openid-auth/trunk/debian/patches/series 2013-06-24 21:40:28 UTC (rev 24943)
+++ packages/django-openid-auth/trunk/debian/patches/series 2013-06-24 21:51:59 UTC (rev 24944)
@@ -1 +1 @@
-fix_settings_database.patch
+django1.5compat.patch
More information about the Python-modules-commits
mailing list