Merge lp:~gandelman-a/ubuntu/raring/python-keystoneclient/oslo.config into lp:~openstack-ubuntu-testing/python-keystoneclient/grizzly

[Adam Gandelman]

Make oslo-config a depends, and override.

From git log:

    Switch to oslo.config.

    The oslo-config package has been renamed. Switch to the new
    version. (should fix SmokeStack).

This will likely ripple out to all projects and start breaking stuff, starting with build depends. Yippie.

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-12 15:06:23 +0000
+++ debian/changelog	2013-03-07 01:27:21 +0000
@@ -1,8 +1,13 @@
 python-keystoneclient (1:0.2.2-0ubuntu3) UNRELEASED; urgency=low
 
-  * debian/patches/fix-requests-requirements.patch: Dropped. 
-
- -- Chuck Short <[e-mail]>  Tue, 12 Feb 2013 09:05:38 -0600
+  [ Chuck Short ]
+  * debian/patches/fix-requests-requirements.patch: Dropped.
+
+  [ Adam Gandelman ]
+  * debian/control, pydist-overrides: Add python-oslo-config.
+  * wrap-and-sort.
+
+ -- Adam Gandelman <[e-mail]>  Wed, 06 Mar 2013 16:18:27 -0800
 
 python-keystoneclient (1:0.2.2-0ubuntu2) raring; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-01-18 13:48:14 +0000
+++ debian/control	2013-03-07 01:27:21 +0000
@@ -2,13 +2,26 @@
 Section: python
 Priority: extra
 Maintainer: Chuck Short <[e-mail]>
-Build-Depends: debhelper (>= 8.0.0), python-httplib2, python-setuptools, 
- python-all (>= 2.6.6-3~), python-nose, python-prettytable, python-nose, python-mox, python-mock, python-simplejson
+Build-Depends: debhelper (>= 8.0.0),
+ python-all (>= 2.6.6-3~),
+ python-httplib2,
+ python-mock,
+ python-mox,
+ python-nose,
+ python-oslo-config,
+ python-prettytable,
+ python-setuptools,
+ python-simplejson
 Standards-Version: 3.9.2
 
 Package: python-keystoneclient
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-pkg-resources, python-requests, python-iso8601
+Depends: python-iso8601,
+ python-oslo-config,
+ python-pkg-resources,
+ python-requests,
+ ${misc:Depends},
+ ${python:Depends}
 Description: Client library for OpenStack Identity API
- This is a client for the OpenStack Identity API. There's a Python API 
+ This is a client for the OpenStack Identity API. There's a Python API
  (the ``keystoneclient`` module), and a command-line script (``keystone``).

=== modified file 'debian/pydist-overrides'
--- debian/pydist-overrides	2012-06-22 17:01:58 +0000
+++ debian/pydist-overrides	2013-03-07 01:27:21 +0000
@@ -1,1 +1,2 @@
 argparse
+oslo.config python-oslo-config