Merge lp:~zulcss/python-glanceclient/fix-ftbfs into lp:~openstack-ubuntu-testing/python-glanceclient/grizzly

[Chuck Short]

new usptream snapshot and fixes ftbfs.

[Adam Gandelman (gandelman-a)]

lgtm

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-23 16:22:11 +0000
+++ debian/changelog	2012-11-29 18:23:23 +0000
@@ -1,3 +1,10 @@
+python-glanceclient (1:0.6.0.7.g09c8216-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release. 
+  * debian/patches/fix-ubuntu-tests.patch: Dropped no longer needed.
+
+ -- Chuck Short <[e-mail]>  Thu, 29 Nov 2012 12:09:58 -0600
+
 python-glanceclient (1:0.6.0-0ubuntu1) raring; urgency=low
 
   [ Adam Gandelman ]

=== removed file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	2012-11-23 16:16:43 +0000
+++ debian/patches/fix-ubuntu-tests.patch	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-diff -Naupr python-glanceclient-0.6.0.orig/tools/test-requires python-glanceclient-0.6.0/tools/test-requires
---- python-glanceclient-0.6.0.orig/tools/test-requires	2012-11-19 23:42:45.000000000 -0600
-+++ python-glanceclient-0.6.0/tools/test-requires	2012-11-23 10:16:05.853179881 -0600
-@@ -6,6 +6,6 @@ nose-exclude
- nosexcover
- openstack.nose_plugin
- nosehtmloutput
--pep8==1.2
-+pep8==1.3.3
- setuptools-git>=0.4
- sphinx>=1.1.2

=== removed file 'debian/patches/series'
--- debian/patches/series	2012-11-22 14:22:29 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fix-ubuntu-tests.patch