Merge lp:~gandelman-a/ubuntu/saucy/nova/avoid_cheetah into lp:~openstack-ubuntu-testing/nova/havana

[Adam Gandelman]

Cya later chester cheeto

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-24 03:01:41 +0000
+++ debian/changelog	2013-05-29 19:19:23 +0000
@@ -1,4 +1,4 @@
-nova (1:2013.2.a732.g7063896-0ubuntu4) UNRELEASED; urgency=low
+nova (1:2013.2.a732.g7063896-0ubuntu5) UNRELEASED; urgency=low
 
   [ Chuck Short ]
   * New upstream version.
@@ -11,10 +11,12 @@
   [ Adam Gandelman ]
   * debian/patches/avoid_requirements_websockify.patch: Remove websockify
     to avoid making it a dependency of every nova package.
+  * debian/patches/avoid_requirements_cheetah.patch: Temporarily remove
+    Cheetah until cheetah's dependencies have been MIR'd.
   * debian/control: Add python-babel.
   * debian/control: Set min. version 0.7.6 on python-netaddr dependency.
 
- -- Adam Gandelman <[e-mail]>  Thu, 23 May 2013 19:25:55 -0700
+ -- Adam Gandelman <[e-mail]>  Wed, 29 May 2013 12:14:56 -0700
 
 nova (1:2013.1-0ubuntu2) raring; urgency=low
 

=== added file 'debian/patches/avoid_requirements_cheetah.patch'
--- debian/patches/avoid_requirements_cheetah.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/avoid_requirements_cheetah.patch	2013-05-29 19:19:23 +0000
@@ -0,0 +1,21 @@
+From: Adam Gandelman <[e-mail]>
+Date: Wed May 29 12:13:38 PDT 2013
+Subject: Avoid Cheetah dependency.
+Ubuntu-bug: https://bugs.launchpad.net/ubuntu/+source/cheetah/+bug/1183634
+Until Cheetah's dependencies have been MIR'd into Main, avoid it
+being listed in requirements.txt and requiring it as a runtime
+dependency.
+
+
+Index: nova/requirements.txt
+===================================================================
+--- nova.orig/requirements.txt	2013-05-29 12:12:38.552151494 -0700
++++ nova/requirements.txt	2013-05-29 12:12:53.416152203 -0700
+@@ -1,7 +1,6 @@
+ d2to1>=0.2.10,<0.3
+ pbr>=0.5,<0.6
+ SQLAlchemy>=0.7.8,<0.7.99
+-Cheetah>=2.4.4
+ amqplib>=0.6.1
+ anyjson>=0.2.4
+ argparse

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-24 02:49:22 +0000
+++ debian/patches/series	2013-05-29 19:19:23 +0000
@@ -1,4 +1,5 @@
 # Ubuntu specific patches below here. Note these can be dropped eventually.
 avoid_requirements_websockify.patch
+avoid_requirements_cheetah.patch
 path-to-the-xenhost.conf-fixup.patch
 fix-docs-build-without-network.patch