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

[Chuck Short]

[Yolanda Robla (yolanda.robla)]

looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-03 14:51:39 +0000
+++ debian/changelog	2013-06-17 12:19:27 +0000
@@ -1,17 +1,13 @@
-nova (1:2013.2.a973.g0afcc05-0ubuntu1) UNRELEASED; urgency=low
+nova (1:2013.2.a1271.gd147af2-0ubuntu1) UNRELEASED; urgency=low
 
+  [Chuck Short]
   * New upstream release.
-  * debian/patches/fix-setup-version-dependency.patch: Hard
-    code dependencies for pbr and d2to1. 
+
+  [Yolanda Robla]
+  * debian/tests: added autopkgtests
 
  -- Chuck Short <[e-mail]>  Mon, 03 Jun 2013 08:52:36 -0500
 
-nova (1:2013.2~b1-0ubuntu2) UNRELEASED; urgency=low
-
-  * debian/tests: added autopkgtests
-
- -- Yolanda Robla <[e-mail]>  Mon, 03 Jun 2013 16:10:12 +0200
-
 nova (1:2013.2~b1-0ubuntu1) saucy; urgency=low
 
   [ Chuck Short ]

=== removed file 'debian/patches/fix-setup-version-dependency.patch'
--- debian/patches/fix-setup-version-dependency.patch	2013-06-03 14:08:47 +0000
+++ debian/patches/fix-setup-version-dependency.patch	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-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-06-03 14:08:47 +0000
+++ debian/patches/series	2013-06-17 12:19:27 +0000
@@ -3,4 +3,3 @@
 avoid_requirements_cheetah.patch
 path-to-the-xenhost.conf-fixup.patch
 fix-docs-build-without-network.patch
-fix-setup-version-dependency.patch