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

[Adam Gandelman]

nova-manage is now just an entry point into the nova python package and requires that all dependencies listed in the nova's egg-info/requires.txt be satisfied. Since nova-manage comes as part of nova-common package, we need to make sure all of nova's requires.txt dependencies are satisfied or nova-manage will throw Exceptions and postinsts will fail:

* sets various dependency versions
* adds python-babel
* requirements.txt lists websockify, but the only package we ship that needs it is nova-novncproxy. Patch it out so it doesn't require moving to nova-common or python-nova becoming a global dependency pulled in by every package.

[lp:~gandelman-a/ubuntu/saucy/nova/depends]

581. By Adam Gandelman on 2013-05-24

changelog typo.

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-19 21:54:04 +0000
+++ debian/changelog	2013-05-24 03:03:27 +0000
@@ -1,5 +1,6 @@
-nova (1:2013.2.a732.g7063896-0ubuntu1) UNRELEASED; urgency=low
+nova (1:2013.2.a732.g7063896-0ubuntu4) UNRELEASED; urgency=low
 
+  [ Chuck Short ]
   * New upstream version.
   * debian/patches/avoid_setuptools_git_dependency.patch: Dropped
     no longer needed.
@@ -7,7 +8,13 @@
   * debian/control: Drop pep8 dependency.
   * debian/patches/fix-ubuntu-tests.patch: Dropped no longer needed.
 
- -- Chuck Short <[e-mail]>  Mon, 13 May 2013 11:37:26 -0500
+  [ Adam Gandelman ]
+  * debian/patches/avoid_requirements_websockify.patch: Remove websockify
+    to avoid making it a dependency of every nova package.
+  * 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
 
 nova (1:2013.1-0ubuntu2) raring; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2013-05-19 21:54:04 +0000
+++ debian/control	2013-05-24 03:03:27 +0000
@@ -10,6 +10,7 @@
 Build-Depends-Indep: openssh-client,
  openssl,
  python-amqplib,
+ python-babel,
  python-boto,
  python-carrot,
  python-cheetah,
@@ -27,7 +28,7 @@
  python-lxml,
  python-migrate,
  python-mox,
- python-netaddr,
+ python-netaddr (>= 0.7.6),
  python-novaclient (>= 1:2.9.0),
  python-oslo-config,
  python-paramiko,
@@ -59,6 +60,7 @@
 Section: python
 Depends: openssh-client,
  openssl,
+ python-babel,
  python-boto,
  python-carrot,
  python-cheetah,
@@ -78,7 +80,7 @@
  python-lxml,
  python-m2crypto,
  python-migrate,
- python-netaddr,
+ python-netaddr (>= 0.7.6),
  python-novaclient (>= 1:2.9.0),
  python-paste,
  python-pastedeploy,
 
=== added file 'debian/patches/avoid_requirements_websockify.patch'
--- debian/patches/avoid_requirements_websockify.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/avoid_requirements_websockify.patch	2013-05-24 03:03:27 +0000
@@ -0,0 +1,18 @@
+From: Adam Gandelman <[e-mail]>
+Date: Thu May 23 19:45:33 PDT 2013
+Subject: Avoid websockify in requirements.txt
+
+The only component that requires websockify is the nova-novncproxy
+package, which pulls it in as a dependency.  Leaving it in requirements.txt
+would turn it into a dependency of python-nova or nova-common.
+
+Index: nova/requirements.txt
+===================================================================
+--- nova.orig/requirements.txt	2013-05-23 19:44:34.183145856 -0700
++++ nova/requirements.txt	2013-05-23 19:44:43.327145520 -0700
+@@ -29,5 +29,4 @@
+ python-keystoneclient>=0.2.0
+ six
+ stevedore>=0.7
+-websockify<0.4
+ oslo.config>=1.1.0
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-19 21:54:04 +0000
+++ debian/patches/series	2013-05-24 03:03:27 +0000
@@ -1,3 +1,4 @@
 # Ubuntu specific patches below here. Note these can be dropped eventually.
+avoid_requirements_websockify.patch
 path-to-the-xenhost.conf-fixup.patch
 fix-docs-build-without-network.patch