* Removed Update_WSGI_app_creation_to_be_compatible_with_Django_1.7.patch

    applied upstream.

Rewritten-From: 93aadf5f281114d61083ac54c91060a12313ce9b

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index a4633610430c85dcf84055256a117ea12a82d8e9..0aba881c65f4e96131f08d5bff25260311356bd5 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,6 +1,8 @@
 horizon (2014.2.1-1) experimental; urgency=medium
 
   * New upstream release.
+  * Removed Update_WSGI_app_creation_to_be_compatible_with_Django_1.7.patch
+    applied upstream.
 
  -- Thomas Goirand <zigo@debian.org>  Sun, 14 Dec 2014 11:44:10 +0000
 

diff --git a/trusty/debian/patches/Update_WSGI_app_creation_to_be_compatible_with_Django_1.7.patch b/trusty/debian/patches/Update_WSGI_app_creation_to_be_compatible_with_Django_1.7.patch
deleted file mode 100644 (file)
index 7cdde7f..0000000
--- a/trusty/debian/patches/Update_WSGI_app_creation_to_be_compatible_with_Django_1.7.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Update WSGI app creation to be compatible with Django 1.7
- This resolves the following error when trying to run Horizon:
- .
- AppRegistryNotReady: The translation infrastructure cannot be initialized
- before the apps registry is ready. Check that you don't make non-lazy gettext
- calls at import time.
- .
- and is backwards-compatible with our currently supported versions (back to
- 1.4).
-Author: Julie Pichon <jpichon@redhat.com>
-Date: Thu, 16 Oct 2014 12:46:10 +0000 (+0100)
-X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fhorizon.git;a=commitdiff_plain;h=686af384c201148c3aebcfbf18b2527587d70ea4
-Change-Id: I1e59f2bf6633a34cfe9230aa028f345e5fa70f94
-Bug-Ubuntu: https://launchpad.net/bugs/1382023
-Origin: Upstream, https://review.openstack.org/#/c/128911/
-Last-Update: 2014-10-16
-
-Index: horizon/openstack_dashboard/wsgi/django.wsgi
-===================================================================
---- horizon.orig/openstack_dashboard/wsgi/django.wsgi
-+++ horizon/openstack_dashboard/wsgi/django.wsgi
-@@ -1,7 +1,7 @@
- import logging
- import os
- import sys
--import django.core.handlers.wsgi
-+from django.core.wsgi import get_wsgi_application
- from django.conf import settings
- 
- # Add this file path to sys.path in order to import settings
-@@ -13,5 +13,4 @@ sys.path.append("/usr/share/openstack-da
- 
- DEBUG = False
- 
--application = django.core.handlers.wsgi.WSGIHandler()
--
-+application = get_wsgi_application()

diff --git a/trusty/debian/patches/fix-dashboard-django-wsgi.patch b/trusty/debian/patches/fix-dashboard-django-wsgi.patch
index f2883be00b986424212cfb35c1f6d88bc804425d..f99e797d9168684f055bb35bdbd720c133d771fd 100644 (file)
--- a/trusty/debian/patches/fix-dashboard-django-wsgi.patch
+++ b/trusty/debian/patches/fix-dashboard-django-wsgi.patch
@@ -4,9 +4,9 @@ Forwarded: not-needed
 
 Index: horizon/openstack_dashboard/wsgi/django.wsgi
 ===================================================================
---- horizon.orig/openstack_dashboard/wsgi/django.wsgi  2012-07-03 14:07:21.316118123 -0700
-+++ horizon/openstack_dashboard/wsgi/django.wsgi       2012-07-03 14:07:26.176118333 -0700
-@@ -9,6 +9,8 @@
+--- horizon.orig/openstack_dashboard/wsgi/django.wsgi
++++ horizon/openstack_dashboard/wsgi/django.wsgi
+@@ -9,6 +9,8 @@ sys.path.insert(0, os.path.join(os.path.
  os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_dashboard.settings'
  sys.stdout = sys.stderr
  
@@ -14,4 +14,4 @@ Index: horizon/openstack_dashboard/wsgi/django.wsgi
 +
  DEBUG = False
  
- application = django.core.handlers.wsgi.WSGIHandler()
+ application = get_wsgi_application()

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 97a3997423e97b7d453a5efc4700fe07f4fb45af..45624e26e8d7bd1fada8322b30e6fabcf5e5d575 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -3,5 +3,4 @@ fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
 disable-failed-django-1.7-test.patch
 Remove_selenium_dependency_when_not_using_selenium_tests.patch
-Update_WSGI_app_creation_to_be_compatible_with_Django_1.7.patch
 CVE-2014-8124_Horizon_login_page_contains_DOS_attack_mechanism_juno.patch