[openstack-ceilometer/el6-havana] adjust newdeps patch to apply to new tree

[Pádraig Brady]

commit ab7dafc8dadc330a89eeafb639ec4b3cbf516e14
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri May 31 17:07:11 2013 +0100

    adjust newdeps patch to apply to new tree

 openstack-ceilometer-newdeps.patch |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/openstack-ceilometer-newdeps.patch b/openstack-ceilometer-newdeps.patch
index ae8994f..dc9f441 100644
--- a/openstack-ceilometer-newdeps.patch
+++ b/openstack-ceilometer-newdeps.patch
@@ -1,10 +1,11 @@
-diff -Naur ceilometer-2013.1.g3.orig/ceilometer/__init__.py ceilometer-2013.1.g3/ceilometer/__init__.py
---- ceilometer-2013.1.g3.orig/ceilometer/__init__.py	2013-04-08 09:54:04.545469160 +0000
-+++ ceilometer-2013.1.g3/ceilometer/__init__.py	2013-04-08 10:01:12.306302227 +0000
-@@ -14,6 +14,28 @@
+diff -Naur ceilometer-2013.2.b1.orig/ceilometer/__init__.py ceilometer-2013.2.b1/ceilometer/__init__.py
+--- ceilometer-2013.2.b1.orig/ceilometer/__init__.py	2013-05-30 15:09:28.000000000 +0000
++++ ceilometer-2013.2.b1/ceilometer/__init__.py	2013-05-31 16:05:56.366704819 +0000
+@@ -13,3 +13,25 @@
+ # License for the specific language governing permissions and limitations
  # under the License.
  #
- 
++
 +import sys
 +import pkg_resources
 +
@@ -26,13 +27,9 @@ diff -Naur ceilometer-2013.1.g3.orig/ceilometer/__init__.py ceilometer-2013.1.g3
 +
 +replace_dist("WebOb >= 1.2")
 +replace_dist("SQLAlchemy >= 0.7.3")
-+
- import gettext
- 
- gettext.install('ceilometer', unicode=1)
-diff -Naur ceilometer-2013.1.g3.orig/ceilometer/storage/sqlalchemy/migration.py ceilometer-2013.1.g3/ceilometer/storage/sqlalchemy/migration.py
---- ceilometer-2013.1.g3.orig/ceilometer/storage/sqlalchemy/migration.py	2013-04-08 09:54:04.608469135 +0000
-+++ ceilometer-2013.1.g3/ceilometer/storage/sqlalchemy/migration.py	2013-04-08 10:06:21.515180041 +0000
+diff -Naur ceilometer-2013.2.b1.orig/ceilometer/storage/sqlalchemy/migration.py ceilometer-2013.2.b1/ceilometer/storage/sqlalchemy/migration.py
+--- ceilometer-2013.2.b1.orig/ceilometer/storage/sqlalchemy/migration.py	2013-05-30 15:09:28.000000000 +0000
++++ ceilometer-2013.2.b1/ceilometer/storage/sqlalchemy/migration.py	2013-05-31 16:03:43.209551099 +0000
 @@ -52,7 +52,13 @@