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

[Liam Young]

[Chuck Short (zulcss)]

Looks like you have a merge conflict in the changelog.

review: Needs Fixing

[lp:~gnuoy/glance/juno-update-deps]

300. By Liam Young on 2014-07-07

Merged Trunk

[Liam Young (gnuoy)]

review: Needs Resubmitting

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-03 12:20:22 +0000
+++ debian/changelog	2014-07-07 07:56:13 +0000
@@ -1,8 +1,12 @@
-glance (1:2014.2~b1-0ubuntu3) UNRELEASED; urgency=medium
+glance (1:2014.2~b1-0ubuntu4) UNRELEASED; urgency=medium
 
+  [ Chuck Short ]
   * debian/control: Add python-posix-ipc as a build dependency.
 
- -- Chuck Short <[e-mail]>  Thu, 03 Jul 2014 08:19:58 -0400
+  [ Liam Young ]
+  * debian/control: Merged in deps from requirements.txt 
+
+ -- Liam Young <[e-mail]>  Mon, 07 Jul 2014 08:39:23 +0100
 
 glance (1:2014.2~b1-0ubuntu2) utopic; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2014-07-03 12:20:22 +0000
+++ debian/control	2014-07-07 07:56:13 +0000
@@ -6,39 +6,41 @@
 Build-Depends-Indep:
  curl,
  python-anyjson (>= 0.3.3),
- python-boto (>= 2.4.0),
- python-cinderclient (>= 1:1.0.4),
+ python-boto (>= 2.12.0),
+ python-cinderclient (>= 1:1.0.8),
  python-crypto (>= 2.6),
  python-eventlet (>= 0.13.0),
  python-fixtures (>= 0.3.12),
  python-greenlet (>= 0.3.2),
- python-httplib2,
- python-iso8601,
- python-jsonschema (>= 1.3.0),
- python-keystoneclient (>= 1:0.3.0),
+ python-httplib2 (>= 0.7.5),
+ python-iso8601 (>= 0.1.9),
+ python-jsonschema (>= 2.0.0),
+ python-keystoneclient (>= 1:0.9.0),
  python-kombu (>= 2.4.8),
  python-lxml (>= 2.3),
- python-migrate,
+ python-migrate (>= 0.9.1),
  python-mox,
- python-openssl,
- python-oslo.config (>= 1:1.2.0),
+ python-netaddr (>= 0.7.6),
+ python-openssl (>= 0.11),
+ python-oslo.config (>= 1:1.2.1),
+ python-oslo.messaging (>= 1.3.0),
+ python-oslo.vmware (>= 0.3),
  python-oslosphinx,
- python-oslo.messaging,
- python-oslo.vmware,
- python-posix-ipc,
  python-passlib,
  python-paste,
- python-pastedeploy,
- python-pbr (>= 0.5.21),
+ python-pastedeploy (>= 1.5.0),
+ python-pbr (>= 0.6),
+ python-posix-ipc,
  python-psutil,
  python-requests (>= 1.1),
- python-routes,
- python-suds,
- python-six,
+ python-routes (>= 1.12.3),
  python-setuptools,
+ python-six (>= 1.7.0),
  python-sphinx,
  python-sqlalchemy-ext | python-sqlalchemy (>= 0.8.2),
- python-swiftclient (>= 1:1.2),
+ python-stevedore (>= 0.14),
+ python-suds,
+ python-swiftclient (>= 1:2.1.0),
  python-testtools (>= 0.9.32),
  python-webob (>= 1.2.3),
  python-xattr,
@@ -55,27 +57,32 @@
 Section: python
 Depends:
  python-anyjson (>= 0.3.3),
- python-boto (>= 2.4.0),
- python-cinderclient (>= 1:1.0.4),
+ python-boto (>= 2.12.0),
+ python-cinderclient (>= 1:1.0.8),
  python-crypto (>= 2.6),
  python-eventlet (>= 0.13.0),
  python-greenlet (>= 0.3.2),
- python-httplib2,
+ python-httplib2 (>= 0.7.5),
  python-iso8601,
+ python-iso8601 (>= 0.1.9),
  python-jsonschema (>= 1.3.0),
- python-keystoneclient (>= 1:0.3.0),
+ python-keystoneclient (>= 1:0.9.0),
  python-kombu (>= 2.4.8),
  python-lxml (>= 2.3),
- python-migrate,
- python-openssl,
- python-oslo.config (>= 1:1.2.0a3),
+ python-migrate (>= 0.9.1),
+ python-netaddr (>= 0.7.6),
+ python-openssl (>= 0.11),
+ python-oslo.config (>= 1:1.2.1),
+ python-oslo.messaging (>= 1.3.0),
+ python-oslo.vmware (>= 0.3),
  python-passlib,
  python-paste,
- python-pastedeploy,
- python-routes,
- python-six,
+ python-pastedeploy (>= 1.5.0),
+ python-posix-ipc,
+ python-routes (>= 1.12.3),
+ python-six (>= 1.7.0),
  python-sqlalchemy-ext | python-sqlalchemy (>= 0.8.2),
- python-swiftclient (>= 1:1.2),
+ python-swiftclient (>= 1:2.1.0),
  python-webob (>= 1.2.3),
  ${misc:Depends},
  ${python:Depends}

=== modified file 'debian/glance-api.install'
--- debian/glance-api.install	2014-04-14 14:22:05 +0000
+++ debian/glance-api.install	2014-07-07 07:56:13 +0000
@@ -2,8 +2,8 @@
 etc/glance-api.conf etc/glance
 etc/glance-cache.conf etc/glance
 etc/glance-scrubber.conf etc/glance
+etc/policy.json etc/glance
 etc/schema-image.json etc/glance
-etc/policy.json etc/glance
 usr/bin/glance-api
 usr/bin/glance-cache-cleaner
 usr/bin/glance-cache-manage