From 9ac2aa4618154384af716f16d41014bd0c60e9f8 Mon Sep 17 00:00:00 2001
From: Gabriel Hurley <gabriel@strikeawe.com>
Date: Thu, 12 Apr 2012 11:35:07 -0700
Subject: [PATCH] Bumping Horizon Django dependency to v1.4 for Folsom.

Horizon is moving to Django 1.4 as the minimum version, however
1.4 is not the packaged version in the apt repositories. Thereby
the dependency needs to be moved back to being installed by pip.

Change-Id: I3c3116c1d02bdfaccab521175816502fd8ea054a
---
 files/apts/horizon | 1 -
 files/pips/horizon | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/apts/horizon b/files/apts/horizon
index b00d8c04c3..d93c34b241 100644
--- a/files/apts/horizon
+++ b/files/apts/horizon
@@ -18,7 +18,6 @@ python-mox
 python-kombu
 python-coverage
 python-cherrypy3 # why?
-python-django
 python-django-mailer
 python-django-nose
 python-django-registration
diff --git a/files/pips/horizon b/files/pips/horizon
index c24754268d..309a5feec6 100644
--- a/files/pips/horizon
+++ b/files/pips/horizon
@@ -1,3 +1,4 @@
+django>=1.4
 django-mailer    # dist:f16
 django-nose      # dist:f16
 django-nose-selenium