Merge lp:~zulcss/nova/nova-fix-setup-deps into lp:~openstack-ubuntu-testing/nova/havana

[Chuck Short]

hardcode pbr and dto1 in setup.py

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-31 12:55:48 +0000
+++ debian/changelog	2013-06-03 14:18:26 +0000
@@ -1,3 +1,11 @@
+nova (1:2013.2.a973.g0afcc05-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/patches/fix-setup-version-dependency.patch: Hard
+    code dependencies for pbr and d2to1. 
+
+ -- Chuck Short <[e-mail]>  Mon, 03 Jun 2013 08:52:36 -0500
+
 nova (1:2013.2~b1-0ubuntu1) saucy; urgency=low
 
   [ Chuck Short ]

=== added file 'debian/patches/fix-setup-version-dependency.patch'
--- debian/patches/fix-setup-version-dependency.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-setup-version-dependency.patch	2013-06-03 14:18:26 +0000
@@ -0,0 +1,10 @@
+diff -Naupr nova-2013.2.a973.g0afcc05.orig/setup.py nova-2013.2.a973.g0afcc05/setup.py
+--- nova-2013.2.a973.g0afcc05.orig/setup.py	2013-06-03 08:43:16.000000000 -0500
++++ nova-2013.2.a973.g0afcc05/setup.py	2013-06-03 08:48:06.825292822 -0500
+@@ -17,5 +17,5 @@
+ import setuptools
+ 
+ setuptools.setup(
+-    setup_requires=['d2to1', 'pbr'],
++    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
+     d2to1=True)

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-29 19:17:52 +0000
+++ debian/patches/series	2013-06-03 14:18:26 +0000
@@ -3,3 +3,4 @@
 avoid_requirements_cheetah.patch
 path-to-the-xenhost.conf-fixup.patch
 fix-docs-build-without-network.patch
+fix-setup-version-dependency.patch