Merge lp:~zulcss/horizon/ftbfs into lp:~openstack-ubuntu-testing/horizon/havana

[Chuck Short]

ftbfs

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

Unmerged revisions

152. By Chuck Short on 2013-05-15

* New upstream release.
* debian/control: Add python-d2to1, python-pbr
* debian/patches/ubuntu_local_settings.patch: Refreshed.

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-22 13:09:18 +0000
+++ debian/changelog	2013-05-15 15:17:29 +0000
@@ -1,3 +1,11 @@
+horizon (1:2013.2.a92.g13b8c8f-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/control: Add python-d2to1, python-pbr
+  * debian/patches/ubuntu_local_settings.patch: Refreshed.
+
+ -- Chuck Short <[e-mail]>  Wed, 15 May 2013 09:46:34 -0500
+
 horizon (1:2013.1-0ubuntu3) raring; urgency=low
 
   * Re-sync Ubuntu theme with upstream changes, fixing instance network

=== modified file 'debian/control'
--- debian/control	2013-03-15 12:29:47 +0000
+++ debian/control	2013-05-15 15:17:29 +0000
@@ -6,10 +6,12 @@
  pep8,
  pylint,
  python-all (>= 2.6.6-3~),
+ python-d2to1,
  python-django-nose,
  python-mox,
  python-netaddr,
  python-nose,
+ python-pbr,
  python-setuptools,
  python-sphinx
 Standards-Version: 3.9.3

=== modified file 'debian/patches/ubuntu_local_settings.patch'
--- debian/patches/ubuntu_local_settings.patch	2013-03-13 11:34:29 +0000
+++ debian/patches/ubuntu_local_settings.patch	2013-05-15 15:17:29 +0000
@@ -1,5 +1,6 @@
---- a/openstack_dashboard/local/local_settings.py.example
-+++ b/openstack_dashboard/local/local_settings.py.example
+diff -Naurp horizon-2013.2.a92.g13b8c8f.orig/openstack_dashboard/local/local_settings.py.example horizon-2013.2.a92.g13b8c8f/openstack_dashboard/local/local_settings.py.example
+--- horizon-2013.2.a92.g13b8c8f.orig/openstack_dashboard/local/local_settings.py.example	2013-05-15 09:45:15.000000000 -0500
++++ horizon-2013.2.a92.g13b8c8f/openstack_dashboard/local/local_settings.py.example	2013-05-15 09:56:29.010312527 -0500
 @@ -4,7 +4,7 @@ from django.utils.translation import uge
  
  from openstack_dashboard import exceptions
@@ -8,26 +9,34 @@
 +DEBUG = False
  TEMPLATE_DEBUG = DEBUG
  
- # Set SSL proxy settings:
-@@ -67,7 +67,8 @@ LOCAL_PATH = os.path.dirname(os.path.abs
+ # Required for Django 1.5.
+@@ -90,12 +90,12 @@ SECRET_KEY = secret_key.generate_or_read
+ # We recommend you use memcached for development; otherwise after every reload
+ # of the django development server, you will have to login again. To use
+ # memcached set CACHES to something like
+-# CACHES = {
+-#    'default': {
+-#        'BACKEND' : 'django.core.cache.backends.memcached.MemcachedCache',
+-#        'LOCATION' : '127.0.0.1:11211',
+-#    }
+-#}
++ CACHES = {
++    'default': {
++        'BACKEND' : 'django.core.cache.backends.memcached.MemcachedCache',
++        'LOCATION' : '127.0.0.1:11211',
++    }
++}
  
  CACHES = {
      'default': {
--        'BACKEND' : 'django.core.cache.backends.locmem.LocMemCache'
-+        'BACKEND' : 'django.core.cache.backends.memcached.MemcachedCache',
-+        'LOCATION' : '127.0.0.1:11211'
-     }
- }
- 
-@@ -76,6 +77,22 @@ EMAIL_BACKEND = 'django.core.mail.backen
+@@ -108,6 +108,21 @@ EMAIL_BACKEND = 'django.core.mail.backen
  # Or send them to /dev/null
  #EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
  
-+# Enable the Ubuntu theme if it is present.
 +try:
-+    from ubuntu_theme import *
++	from ubuntu_theme import *
 +except ImportError:
-+    pass
++	pass
 +
 +# Default Ubuntu apache configuration uses /horizon as the application root.
 +# Configure auth redirects here accordingly.