[openstack-keystone/el6-havana] adjust newdeps patch for havana-2

[Pádraig Brady]

commit f365779012b6b3d869d9e3ba6ad5e75980f49d60
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Jul 22 01:33:38 2013 +0100

    adjust newdeps patch for havana-2

 openstack-keystone-newdeps.patch |   44 +++++++++++++++++++------------------
 1 files changed, 23 insertions(+), 21 deletions(-)
---
diff --git a/openstack-keystone-newdeps.patch b/openstack-keystone-newdeps.patch
index 845dfa1..fca468c 100644
--- a/openstack-keystone-newdeps.patch
+++ b/openstack-keystone-newdeps.patch
@@ -1,5 +1,26 @@
---- keystone-2012.2/keystone/__init__.py.newdeps	2012-02-29 11:16:06.000000000 +0100
-+++ keystone-2012.2/keystone/__init__.py	2012-03-01 22:42:08.546503618 +0100
+diff -Naur keystone-2013.2.b2.orig/bin/keystone-all keystone-2013.2.b2/bin/keystone-all
+--- keystone-2013.2.b2.orig/bin/keystone-all	2013-07-18 19:01:20.000000000 +0000
++++ keystone-2013.2.b2/bin/keystone-all	2013-07-22 00:31:19.289679079 +0000
+@@ -17,7 +17,6 @@
+     sys.path.insert(0, possible_topdir)
+ 
+ 
+-from paste import deploy
+ import pbr.version
+ 
+ from keystone.common import environment
+@@ -26,6 +25,8 @@
+ from keystone.openstack.common import gettextutils
+ from keystone.openstack.common import importutils
+ 
++from paste import deploy
++
+ 
+ CONF = config.CONF
+ 
+diff -Naur keystone-2013.2.b2.orig/keystone/__init__.py keystone-2013.2.b2/keystone/__init__.py
+--- keystone-2013.2.b2.orig/keystone/__init__.py	2013-07-22 00:29:30.734905980 +0000
++++ keystone-2013.2.b2/keystone/__init__.py	2013-07-22 00:32:08.954490625 +0000
 @@ -0,0 +1,29 @@
 +import sys
 +import pkg_resources
@@ -30,22 +51,3 @@
 +# TODO: See can we get pkg_resources to do the right thing directly
 +import paste
 +paste.__path__.insert(0, paste.__path__.pop(-1))
---- keystone-2013.2.b1/bin/keystone-all.newdeps	2013-06-24 12:16:30.051458695 +0200
-+++ keystone-2013.2.b1/bin/keystone-all	2013-06-24 12:18:38.187956365 +0200
-@@ -18,7 +18,6 @@
-     sys.path.insert(0, possible_topdir)
- 
- 
--from paste import deploy
- import pbr.version
- 
- from keystone.common import utils
-@@ -26,6 +25,8 @@
- from keystone import config
- from keystone.openstack.common import importutils
- 
-+from paste import deploy
-+
- 
- CONF = config.CONF
-