diff -Nru python-django-openstack-auth-1.1.6/debian/changelog python-django-openstack-auth-1.1.6/debian/changelog --- python-django-openstack-auth-1.1.6/debian/changelog 2014-09-08 13:58:05.000000000 -0400 +++ python-django-openstack-auth-1.1.6/debian/changelog 2014-09-22 12:16:19.000000000 -0400 @@ -1,3 +1,12 @@ +python-django-openstack-auth (1.1.6-3ubuntu1) utopic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/control: Drop python-hacking from BD's; its not used and checking + coding standards at package build time is way to late. + - d/p/fix-tests.patch: Added temporary patch to fix tests. + + -- Corey Bryant Fri, 19 Sep 2014 13:49:32 -0400 + python-django-openstack-auth (1.1.6-3) unstable; urgency=medium * Added Django 1.7 patches. Thanks to Raphael Hertzog for the bug report @@ -28,6 +37,15 @@ -- Thomas Goirand Thu, 22 May 2014 18:58:29 +0800 +python-django-openstack-auth (1.1.5-2ubuntu1) utopic; urgency=medium + + * Resync with Debian unstable. + * d/control: Drop python-hacking from BD's; its not used and checking + coding standards at package build time is way to late. + * d/control: Bumped Standards-Version, no changes. + + -- James Page Mon, 19 May 2014 16:58:41 +0100 + python-django-openstack-auth (1.1.5-2) unstable; urgency=medium * Uploading to unstable. @@ -88,3 +106,4 @@ Initial release (Closes: #687932). -- Thomas Goirand Thu, 20 Dec 2012 09:56:57 +0000 + diff -Nru python-django-openstack-auth-1.1.6/debian/control python-django-openstack-auth-1.1.6/debian/control --- python-django-openstack-auth-1.1.6/debian/control 2014-09-08 13:58:05.000000000 -0400 +++ python-django-openstack-auth-1.1.6/debian/control 2014-09-22 12:16:11.000000000 -0400 @@ -1,7 +1,8 @@ Source: python-django-openstack-auth Section: python Priority: optional -Maintainer: PKG OpenStack +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: PKG OpenStack Uploaders: Julien Danjou , Thomas Goirand , Ghe Rivero , @@ -14,7 +15,6 @@ Build-Depends-Indep: python-babel (>= 1.3), python-coverage (>= 3.6), python-django (>= 1.4), - python-hacking (>= 0.8.0), python-keystoneclient (>= 1:0.8.0), python-mox3, python-oslosphinx, diff -Nru python-django-openstack-auth-1.1.6/debian/patches/fix-tests.patch python-django-openstack-auth-1.1.6/debian/patches/fix-tests.patch --- python-django-openstack-auth-1.1.6/debian/patches/fix-tests.patch 1969-12-31 19:00:00.000000000 -0500 +++ python-django-openstack-auth-1.1.6/debian/patches/fix-tests.patch 2014-09-22 12:17:07.000000000 -0400 @@ -0,0 +1,45 @@ +Origin: upstream, https://github.com/openstack/django_openstack_auth/commit/95dffe082adc72594587ed7dd36521f315655dbf +Forwarded: not-needed +From 95dffe082adc72594587ed7dd36521f315655dbf Mon Sep 17 00:00:00 2001 +From: Akihiro Motoki +Date: Tue, 29 Jul 2014 01:21:40 +0900 +Subject: [PATCH] Replace UserManager/TenantManager with None in tests + +UserManager/TenantManager seems private classes in keystoneclient +and the interface was changed in keystoneclient 0.10.0. +django-openstack-auth tests actually don't need these managers, +so this commit makes test data not use these classes. + +Change-Id: I9398c705acab262e89d4801da84ccea188980d99 +Closes-Bug: #1349485 +--- + openstack_auth/tests/data_v2.py | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +--- a/openstack_auth/tests/data_v2.py ++++ b/openstack_auth/tests/data_v2.py +@@ -53,8 +53,7 @@ + 'password': 'swordfish', + 'token': '', + 'enabled': True} +- test_data.user = users.User(users.UserManager(None), +- user_dict, loaded=True) ++ test_data.user = users.User(None, user_dict, loaded=True) + + # Tenants + tenant_dict_1 = {'id': uuid.uuid4().hex, +@@ -65,12 +64,8 @@ + 'name': 'tenant_two', + 'description': '', + 'enabled': False} +- test_data.tenant_one = tenants.Tenant(tenants.TenantManager(None), +- tenant_dict_1, +- loaded=True) +- test_data.tenant_two = tenants.Tenant(tenants.TenantManager(None), +- tenant_dict_2, +- loaded=True) ++ test_data.tenant_one = tenants.Tenant(None, tenant_dict_1, loaded=True) ++ test_data.tenant_two = tenants.Tenant(None, tenant_dict_2, loaded=True) + + nova_service = { + 'type': 'compute', diff -Nru python-django-openstack-auth-1.1.6/debian/patches/series python-django-openstack-auth-1.1.6/debian/patches/series --- python-django-openstack-auth-1.1.6/debian/patches/series 2014-09-08 13:58:05.000000000 -0400 +++ python-django-openstack-auth-1.1.6/debian/patches/series 2014-09-22 12:14:48.000000000 -0400 @@ -1,2 +1,3 @@ +fix-tests.patch 0001-Call-django.setup-before-running-tests-for-Django-1..patch 0002-Don-t-call-check_for_test_cookie-with-Django-1.7.patch