Merge lp:~gnuoy/python-novaclient/juno-update-deps into lp:~ubuntu-server-dev/python-novaclient/juno

[Liam Young]

[Chuck Short (zulcss)]

Can you clean up the merge conflicts?

[lp:~gnuoy/python-novaclient/juno-update-deps]

88. By Liam Young on 2014-07-07

Merged trunk in

[Liam Young (gnuoy)]

review: Needs Resubmitting

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-03 12:24:44 +0000
+++ debian/changelog	2014-07-07 10:39:29 +0000
@@ -1,11 +1,15 @@
-python-novaclient (1:2.17.0-0ubuntu2) UNRELEASED; urgency=medium
+python-novaclient (1:2.17.0-0ubuntu3) UNRELEASED; urgency=medium
 
+  [ Chuck Short ]
   * debian/control: Open up juno release
   * debian/control: Add python-httpretty as a build depends.
   * debian/control: Add python-keystoneclient and python-testscenarios
     as build dependencies.
 
- -- Chuck Short <[e-mail]>  Tue, 22 Apr 2014 11:27:31 -0400
+  [ Liam Young ]
+  * debian/control: Merged in deps from requirements.txt 
+
+ -- Liam Young <[e-mail]>  Mon, 07 Jul 2014 11:36:08 +0100
 
 python-novaclient (1:2.17.0-0ubuntu1) trusty; urgency=medium
 
 
=== modified file 'debian/control'
--- debian/control	2014-07-03 12:24:44 +0000
+++ debian/control	2014-07-07 10:39:29 +0000
@@ -2,23 +2,24 @@
 Section: python
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50),
+Build-Depends:
+ debhelper (>= 7.0.50),
  python-all (>= 2.6),
- python-babel (>= 0.9.6),
+ python-babel (>= 1.3),
  python-d2to1,
  python-distribute,
  python-fixtures (>= 0.3.12),
+ python-httpretty,
+ python-iso8601 (>= 0.1.9),
  python-keyring,
- python-httpretty,
- python-iso8601,
  python-mock (>= 0.7),
- python-pbr (>= 0.5.21),
- python-prettytable (>= 0.6),
+ python-pbr (>= 0.6),
+ python-prettytable (>= 0.7),
  python-keystoneclient,
  python-requests (>= 1.1),
  python-setuptools,
- python-six,
  python-simplejson (>= 2.0.9),
+ python-six (>= 1.7.0),
  python-testtools (>= 0.9.32),
  python-testscenarios,
  testrepository (>= 0.0.17)
@@ -30,13 +31,15 @@
 
 Package: python-novaclient
 Architecture: all
-Depends: python-iso8601,
+Depends:
+ python-babel (>= 1.3),
+ python-iso8601,
+ python-iso8601 (>= 0.1.9),
  python-pkg-resources,
- python-prettytable (>= 0.6),
+ python-prettytable (>= 0.7),
  python-requests (>= 1.1),
  python-simplejson (>= 2.0.9),
- python-six,
- python-babel (>= 0.9.6),
+ python-six (>= 1.7.0),
  ${misc:Depends},
  ${python:Depends}
 XB-Python-Version: ${python:Versions}