Merge lp:~corey.bryant/heat/2015.1-b2-0ubuntu1 into lp:~ubuntu-server-dev/heat/kilo

[Corey Bryant]

[lp:~corey.bryant/heat/2015.1-b2-0ubuntu1]

90. By Corey Bryant on 2015-02-12

Add dash to python-oslo-* dependencies

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-21 11:47:25 +0000
+++ debian/changelog	2015-02-12 17:02:03 +0000
@@ -1,9 +1,16 @@
-heat (2015.1~b1-0ubuntu5) UNRELEASED; urgency=medium
+heat (2015.1~b2-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ James Page ]
   * d/heat-common.postinst: Update to use getent for detection of existing
     heat user and group (LP: #1328315).
 
- -- James Page <[e-mail]>  Wed, 21 Jan 2015 11:47:15 +0000
+  [ Corey Bryant ]
+  * New upstream release.
+    - d/control: Align with upstream dependencies.
+    - d/p/oslo-i18n-private-classes.patch: Dropped. Fixed upstream.
+    - d/p/remove-gettextutils-import.patch: Dropped. Fixed upstream.
+
+ -- Corey Bryant <[e-mail]>  Fri, 06 Feb 2015 08:55:35 -0500
 
 heat (2015.1~b1-0ubuntu4) vivid; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2015-01-14 15:44:22 +0000
+++ debian/control	2015-02-12 17:02:03 +0000
@@ -23,15 +23,15 @@
  python-cinderclient (>= 1:1.1.0),
  python-coverage (>= 3.6),
  python-crypto (>= 2.6),
- python-eventlet (>= 0.15.2),
+ python-eventlet (>= 0.16.1),
  python-extras,
  python-glanceclient (>= 1:0.15.0),
  python-greenlet (>= 0.3.2),
- python-hacking (>= 0.8.0),
+ python-hacking (>= 0.9.4),
  python-heatclient (>= 0.2.9),
  python-httplib2 (>= 0.7.5),
  python-iso8601 (>= 0.1.9),
- python-keystoneclient (>= 1:0.11.1),
+ python-keystoneclient (>= 1:1.0.0),
  python-keystonemiddleware (>= 1.0.0),
  python-kombu (>=2.5.0),
  python-lockfile (>= 0.8),
@@ -45,20 +45,22 @@
  python-neutronclient (>= 1:2.3.6),
  python-novaclient (>= 1:2.18.0),
  python-osprofiler (>= 0.3.0),
- python-oslo.middleware (>= 0.1.0),
- python-oslo.serialization (>= 1.0.0),
- python-oslo.config (>= 1:1.4.0),
- python-oslo.db (>= 1.1.0),
- python-oslo.i18n (>= 1.0.0),
- python-oslo.messaging (>= 1.4.0),
- python-oslo.utils (>= 1.1.0),
+ python-oslo-middleware (>= 0.3.0),
+ python-oslo-serialization (>= 1.2.0),
+ python-oslo-config (>= 1:1.6.0),
+ python-oslo-context (>= 0.1.0),
+ python-oslo-db (>= 1.4.1),
+ python-oslo-i18n (>= 1.3.0),
+ python-oslo-messaging (>= 1.4.0),
+ python-oslo-utils (>= 1.2.0),
  python-oslosphinx (>= 2.2.0),
- python-oslotest (>= 1:1.1.0),
+ python-oslotest (>= 1:1.2.0),
  python-posix-ipc,
- python-paramiko,
+ python-paramiko (>= 1.13.0),
  python-paste,
  python-pastedeploy (>= 1.5.0),
  python-psycopg2,
+ python-qpid,
  python-requests (>= 2.2.0),
  python-routes (>= 1.12.3),
  python-saharaclient (>= 0.7.6),
@@ -67,10 +69,10 @@
  python-six (>= 1.7.0),
  python-sphinx (>= 1.1.2),
  python-sqlalchemy (>= 0.9.7),
- python-swiftclient (>= 2.2.0),
+ python-swiftclient (>= 1:2.2.0),
  python-testrepository (>= 0.0.18),
  python-testscenarios (>= 0.4),
- python-testtools (>= 0.9.34),
+ python-testtools (>= 0.9.36),
  python-troveclient (>= 1:1.0.7),
  python-webob (>= 1.2.3),
  python-yaml (>= 3.1.0),
@@ -93,15 +95,15 @@
  python-cinderclient (>= 1:1.1.0),
  python-coverage (>= 3.6),
  python-crypto (>= 2.6),
- python-eventlet (>= 0.15.2),
+ python-eventlet (>= 0.16.1),
  python-extras,
  python-glanceclient (>= 1:0.15.0),
  python-greenlet (>= 0.3.2),
  python-httplib2 (>= 0.7.5),
  python-iso8601 (>= 0.1.9),
- python-hacking (>= 0.8.0),
+ python-hacking (>= 0.9.4),
  python-heatclient (>= 0.2.9),
- python-keystoneclient (>= 1:0.11.1),
+ python-keystoneclient (>= 1:1.0.0),
  python-keystonemiddleware (>= 1.0.0),
  python-kombu (>=2.5.0),
  python-lockfile (>= 0.8),
@@ -113,19 +115,21 @@
  python-neutronclient (>= 1:2.3.6),
  python-novaclient (>= 1:2.18.0),
  python-osprofiler (>= 0.3.0),
- python-oslo.config (>= 1:1.4.0),
- python-oslo.db (>= 1.1.0),
- python-oslo.i18n (>= 1.0.0),
- python-oslo.messaging (>= 1.4.0),
- python-oslo.middleware (>= 0.1.0),
- python-oslo.serialization (>= 1.0.0),
- python-oslo.utils (>= 1.1.0),
+ python-oslo-config (>= 1:1.6.0),
+ python-oslo-context (>= 0.1.0),
+ python-oslo-db (>= 1.4.1),
+ python-oslo-i18n (>= 1.3.0),
+ python-oslo-messaging (>= 1.4.0),
+ python-oslo-middleware (>= 0.3.0),
+ python-oslo-serialization (>= 1.2.0),
+ python-oslo-utils (>= 1.2.0),
  python-oslosphinx (>= 2.2.0),
  python-paste,
  python-pastedeploy (>= 1.5.0),
  python-pbr (>= 0.6),
  python-posix-ipc,
  python-psycopg2,
+ python-qpid,
  python-requests (>= 2.2.0),
  python-routes (>= 1.12.3),
  python-saharaclient (>= 0.7.6),
@@ -134,7 +138,7 @@
  python-sphinx (>= 1.1.2),
  python-sqlalchemy (>= 0.9.7),
  python-stevedore (>= 1.1.0),
- python-swiftclient (>= 2.2.0),
+ python-swiftclient (>= 1:2.2.0),
  python-troveclient (>= 1:1.0.7),
  python-webob (>= 1.2.3),
  python-yaml (>= 3.1.0),

=== removed file 'debian/patches/oslo-i18n-private-classes.patch'
--- debian/patches/oslo-i18n-private-classes.patch	2015-01-12 16:30:28 +0000
+++ debian/patches/oslo-i18n-private-classes.patch	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-From 40fa30fd741968a182e21f98d70ec256e542d49a Mon Sep 17 00:00:00 2001
-From: Doug Hellmann <[e-mail]>
-Date: Tue, 6 Jan 2015 10:56:10 -0500
-Subject: [PATCH] Do not use private classes from oslo.i18n
-
-Use oslo.i18n.translate() without first testing if the argument being
-passed is a Message instance. The Message class is meant to be hidden
-from consumers, and translate() correctly detects untranslatable strings
-and returns them as given.
-
-Change-Id: I6e907adf16d8cf6fbbcf526632c91ca81611ea09
----
- heat/common/wsgi.py | 15 ++-------------
- 1 file changed, 2 insertions(+), 13 deletions(-)
-
-diff --git a/heat/common/wsgi.py b/heat/common/wsgi.py
-index 86d6166..28608ec 100644
---- a/heat/common/wsgi.py
-+++ b/heat/common/wsgi.py
-@@ -744,19 +744,8 @@ def translate_exception(exc, locale):
-         exc.message = i18n.translate(six.text_type(exc), locale)
- 
-     if isinstance(exc, webob.exc.HTTPError):
--        # If the explanation is not a Message, that means that the
--        # explanation is the default, generic and not translatable explanation
--        # from webop.exc. Since the explanation is the error shown when the
--        # exception is converted to a response, let's actually swap it with
--        # message, since message is what gets passed in at construction time
--        # in the API
--        if not isinstance(exc.explanation, i18n._message.Message):
--            exc.explanation = six.text_type(exc)
--            exc.detail = ''
--        else:
--            exc.explanation = \
--                i18n.translate(exc.explanation, locale)
--            exc.detail = i18n.translate(exc.detail, locale)
-+        exc.explanation = i18n.translate(exc.explanation, locale)
-+        exc.detail = i18n.translate(getattr(exc, 'detail', ''), locale)
-     return exc
- 
- 
--- 
-2.1.0
-

=== removed file 'debian/patches/remove-gettextutils-import.patch'
--- debian/patches/remove-gettextutils-import.patch	2015-01-05 20:56:10 +0000
+++ debian/patches/remove-gettextutils-import.patch	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-From 213ed63a240e04cdbf757a7379a69b47452113b6 Mon Sep 17 00:00:00 2001
-From: Tetiana Lashchova <[e-mail]>
-Date: Fri, 19 Dec 2014 16:19:55 +0200
-Subject: [PATCH] Remove gettextutils import
-
-Change-Id: I48846926cc5eb2a1f81db6a2becb310bdf61daa7
-Closes-Bug: #1404206
----
- heat/openstack/common/config/generator.py | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/heat/openstack/common/config/generator.py b/heat/openstack/common/config/generator.py
-index 43113b3..0bf9849 100644
---- a/heat/openstack/common/config/generator.py
-+++ b/heat/openstack/common/config/generator.py
-@@ -31,12 +31,9 @@ from oslo.config import cfg
- import six
- import stevedore.named
- 
--from heat.openstack.common import gettextutils
- from heat.common import i18n
- from heat.openstack.common import importutils
- 
--gettextutils.install('heat')
--
- STROPT = "StrOpt"
- BOOLOPT = "BoolOpt"
- INTOPT = "IntOpt"
--- 
-2.1.0
-

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-01-12 16:30:28 +0000
+++ debian/patches/series	2015-02-12 17:02:03 +0000
@@ -1,5 +1,3 @@
-oslo-i18n-private-classes.patch
-remove-gettextutils-import.patch
 #default-sqlite.patch
 fix-requirements.patch
 sudoers_patch.patch