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

[Chuck Short]

[Adam Gandelman (gandelman-a)]

Approved but note that both new deps need MIRs before this will build in distro.

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-24 18:43:36 +0000
+++ debian/changelog	2013-05-13 17:09:26 +0000
@@ -1,3 +1,12 @@
+nova (1:2013.2.a613.gda1d739-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream version.
+  * debian/patches/avoid_setuptools_git_dependency.patch: Dropped
+    no longer needed.
+  * debian/control: Add python-pbr and python-d2to1 as build dependencies.
+
+ -- Chuck Short <[e-mail]>  Mon, 13 May 2013 11:37:26 -0500
+
 nova (1:2013.1-0ubuntu2) raring; urgency=low
 
   * debian/nova-cells.upstart: Fix typo in upstart job. (LP: #1163218) 
 
=== modified file 'debian/control'
--- debian/control	2013-04-11 12:54:27 +0000
+++ debian/control	2013-05-13 17:09:26 +0000
@@ -16,6 +16,7 @@
  python-cinderclient,
  python-coverage,
  python-crypto,
+ python-d2to1,
  python-distutils-extra,
  python-eventlet,
  python-fixtures (>= 0.3.12),
@@ -32,6 +33,7 @@
  python-paramiko,
  python-paste,
  python-pastedeploy (>= 1.5.0),
+ python-pbr,
  python-pyasn1,
  python-quantumclient,
  python-routes,
 
=== removed file 'debian/patches/avoid_setuptools_git_dependency.patch'
--- debian/patches/avoid_setuptools_git_dependency.patch	2013-03-14 00:48:45 +0000
+++ debian/patches/avoid_setuptools_git_dependency.patch	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-Index: nova/tools/pip-requires
-===================================================================
---- nova.orig/tools/pip-requires	2013-03-13 17:47:30.180806431 -0700
-+++ nova/tools/pip-requires	2013-03-13 17:47:45.816807224 -0700
-@@ -20,7 +20,6 @@
- Babel>=0.9.6
- iso8601>=0.1.4
- httplib2
--setuptools_git>=0.4
- python-cinderclient>=1.0.1
- python-quantumclient>=2.2.0,<3.0.0
- python-glanceclient>=0.5.0,<2
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-12-11 10:27:32 +0000
+++ debian/patches/series	2013-05-13 17:09:26 +0000
@@ -2,4 +2,3 @@
 path-to-the-xenhost.conf-fixup.patch
 fix-ubuntu-tests.patch
 fix-docs-build-without-network.patch
-avoid_setuptools_git_dependency.patch