Merge lp:~yolanda.robla/python-cinderclient/grizzly-fix-setuptools-git into lp:~ubuntu-server-dev/python-cinderclient/grizzly

[Yolanda Robla]

* debian/control: add python-setuptools-git dependency required by build process.

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-10 16:36:15 +0000
+++ debian/changelog	2012-12-10 18:26:27 +0000
@@ -4,8 +4,7 @@
   * New upstream release.
 
   [ Yolanda Robla ]
-  * debian/patches/avoid_setuptools_git_dependency.patch: Drop requirement for
-    python-setuptools-git during build process.
+  * debian/control: add python-setuptools-git dependency 
   * debian/copyright: Removed remaining dh boilerplate template.
 
  -- Yolanda Robla <[e-mail]>  Mon, 10 Dec 2012 17:02:00 +0100

=== modified file 'debian/control'
--- debian/control	2012-09-19 21:33:52 +0000
+++ debian/control	2012-12-10 18:26:27 +0000
@@ -11,7 +11,8 @@
  python-mock,
  pep8,
  python-sphinx,
- python-unittest2
+ python-unittest2,
+ python-setuptools-git (>= 0.4)
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.5
 

=== removed file 'debian/patches/avoid_setuptools_git_dependency.patch'
--- debian/patches/avoid_setuptools_git_dependency.patch	2012-12-10 16:36:15 +0000
+++ debian/patches/avoid_setuptools_git_dependency.patch	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-Description: Drop requirement for python-setuptools-git during build process.
- This is used during the upstream python build process and it not
- required to build the package for Ubuntu.
-Author: Yolanda Robla <[e-mail]>
-Forwarded: not-needed
-
-Index: python-cinderclient/setup.py
-===================================================================
---- python-cinderclient.orig/setup.py	2012-12-10 16:12:45.931742694 +0000
-+++ python-cinderclient/setup.py	2012-12-10 16:13:05.219739811 +0000
-@@ -41,7 +41,6 @@
-     cmdclass=setup.get_cmdclass(),
-     install_requires=requires,
-     tests_require=tests_require,
--    setup_requires=['setuptools-git>=0.4'],
-     dependency_links=depend_links,
-     test_suite="nose.collector",
-     classifiers=[

=== removed file 'debian/patches/series'
--- debian/patches/series	2012-12-10 16:24:49 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-avoid_setuptools_git_dependency.patch