Merge lp:~dpolehn-gmail/ubuntu/precise/keystone/fix-922954-907206 into lp:ubuntu/precise/keystone

[Daniel Polehn]

Fixing bug in man page and a missing dependency.

[Dave Walker (davewalker)]

Thanks for these fixes!

I have pushed your branch to the staging branch at:
 - lp:~ubuntu-server-dev/keystone/essex/

This will be included in the next upload, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-26 10:53:46 +0000
+++ debian/changelog	2012-01-29 06:49:25 +0000
@@ -1,3 +1,10 @@
+keystone (2012.1~e3-0ubuntu2) precise; urgency=low
+
+  * Fix bad manpage formatting causing missing spaces (LP: #907206)
+  * Adding python-prettytable to dependency.  (LP: #922954) 
+
+ -- Daniel Polehn <[e-mail]>  Sat, 28 Jan 2012 20:17:33 -0800
+
 keystone (2012.1~e3-0ubuntu1) precise; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2012-01-13 10:09:46 +0000
+++ debian/control	2012-01-29 06:49:25 +0000
@@ -43,6 +43,7 @@
  python-paste,
  python-pastedeploy,
  python-pastescript,
+ python-prettytable,
  python-webob
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}

=== modified file 'debian/man/keystone.8'
--- debian/man/keystone.8	2011-12-16 15:38:05 +0000
+++ debian/man/keystone.8	2012-01-29 06:49:25 +0000
@@ -4,8 +4,8 @@
 .SH SYNOPSIS
 .I [OPTION]...
 .SH DESCRIPTION
-.BR keystone is a Python implementation of the Openstack
-identity service.
+.B keystone is a Python implementation of the Openstack
+.B identity service.
 .TP
 .B --version
 show program's version number and exit