From fb5c1413481c40330e7ba3f23bab1d65316dc6f2 Mon Sep 17 00:00:00 2001
From: vsaienko <vsaienko@mirantis.com>
Date: Thu, 28 May 2015 09:11:25 +0300
Subject: [PATCH] Fix python-oslo-* dependency names

  replace python-oslo-something with  python-oslo.something

Change-Id: I266e4f66594279cf94fd755121abe71d723fcf41
Related-Bug: #1459494
---
 trusty/debian/changelog        |  7 +++++
 trusty/debian/control          | 50 +++++++++++++++++-----------------
 trusty/debian/pydist-overrides | 13 ---------
 3 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 7f28f5622..c4263c825 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+cinder (1:2015.1.0-1~u14.04+mos2) mos7.0; urgency=medium
+
+  * Fix python-oslo-* naming scheme
+  #LP 1459494
+
+ -- Vasyl Saienko <vsaienko@mirantis.com>  Thu, 28 May 2015 09:05:46 +0200
+
 cinder (1:2015.1.0-1~u14.04+mos1) mos7.0; urgency=medium
 
   * Update spec for Kilo
diff --git a/trusty/debian/control b/trusty/debian/control
index fb34313b1..207dc98f4 100644
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -29,18 +29,18 @@ Build-Depends-Indep:
  python-mysqldb,
  python-netaddr (>= 0.7.12),
  python-novaclient (>= 1:2.22.0),
- python-oslo-concurrency (>= 1.8.0),
- python-oslo-config (>= 1:1.9.3),
- python-oslo-context (>= 0.2.0),
- python-oslo-db (>= 1.7.0),
- python-oslo-i18n (>= 1.5.0),
- python-oslo-log (>= 1.0.0),
- python-oslo-messaging (>= 1.8.0),
- python-oslo-middleware (>= 1.0.0),
- python-oslo-rootwrap (>= 1.6.0),
- python-oslo-serialization (>= 1.4.0),
- python-oslo-utils (>= 1.4.0),
- python-oslo-vmware (>= 0.11.1),
+ python-oslo.concurrency (>= 1.8.0),
+ python-oslo.config (>= 1:1.9.3),
+ python-oslo.context (>= 0.2.0),
+ python-oslo.db (>= 1.7.0),
+ python-oslo.i18n (>= 1.5.0),
+ python-oslo.log (>= 1.0.0),
+ python-oslo.messaging (>= 1.8.0),
+ python-oslo.middleware (>= 1.0.0),
+ python-oslo.rootwrap (>= 1.6.0),
+ python-oslo.serialization (>= 1.4.0),
+ python-oslo.utils (>= 1.4.0),
+ python-oslo.vmware (>= 0.11.1),
  python-oslosphinx (>= 2.5.0),
  python-oslotest (>= 1.5.1),
  python-osprofiler (>= 0.3.0),
@@ -87,23 +87,23 @@ Depends:
  python-keystoneclient (>= 1:1.1.0),
  python-keystonemiddleware (>= 1.5.0),
  python-kombu (>= 2.5.0),
- python-lockfile (>= 0.8),
+ python-lockfile (>= 1:0.8),
  python-lxml (>= 2.3),
  python-migrate (>= 0.9.5),
  python-netaddr (>= 0.7.12),
  python-novaclient (>= 1:2.22.0),
- python-oslo-concurrency (>= 1.8.0),
- python-oslo-config (>= 1:1.9.3),
- python-oslo-context (>= 0.2.0),
- python-oslo-db (>= 1.7.0),
- python-oslo-i18n (>= 1.5.0),
- python-oslo-log (>= 1.0.0),
- python-oslo-messaging (>= 1.8.0),
- python-oslo-middleware (>= 1.0.0),
- python-oslo-rootwrap (>= 1.6.0),
- python-oslo-serialization (>= 1.4.0),
- python-oslo-utils (>= 1.4.0),
- python-oslo-vmware (>= 0.11.1),
+ python-oslo.concurrency (>= 1.8.0),
+ python-oslo.config (>= 1:1.9.3),
+ python-oslo.context (>= 0.2.0),
+ python-oslo.db (>= 1.7.0),
+ python-oslo.i18n (>= 1.5.0),
+ python-oslo.log (>= 1.0.0),
+ python-oslo.messaging (>= 1.8.0),
+ python-oslo.middleware (>= 1.0.0),
+ python-oslo.rootwrap (>= 1.6.0),
+ python-oslo.serialization (>= 1.4.0),
+ python-oslo.utils (>= 1.4.0),
+ python-oslo.vmware (>= 0.11.1),
  python-osprofiler (>= 0.3.0),
  python-paramiko (>= 1.13.0),
  python-paste,
diff --git a/trusty/debian/pydist-overrides b/trusty/debian/pydist-overrides
index ab459a927..ae82e2d80 100644
--- a/trusty/debian/pydist-overrides
+++ b/trusty/debian/pydist-overrides
@@ -1,14 +1 @@
 rtslib-fb
-oslo.context python-oslo-context
-oslo.concurrency python-oslo-concurrency
-oslo.config python-oslo-config
-oslo.messaging python-oslo-messaging
-oslo.vmware python-oslo-vmware
-oslo.utils python-oslo-utils
-oslo.serialization python-oslo-serialization
-oslo.db python-oslo-db
-oslo.i18n python-oslo-i18n
-oslo.utils python-oslo-utils
-oslo.rootwrap python-oslo-rootwrap
-oslo.log python-oslo-log
-oslo.middleware python-oslo-middleware
-- 
2.45.2