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

[Yolanda Robla]

* debian/patches/avoid_setuptools_git_dependency.patch: Drop requirement for python-setuptools-git during build process.
* debian/copyright: Removed remaining dh boilerplate template.

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-21 17:31:21 +0000
+++ debian/changelog	2012-12-10 16:33:22 +0000
@@ -1,8 +1,14 @@
-python-cinderclient (1:1.0.0.16.g79dc21d-0ubuntu1) UNRELEASED; urgency=low
+python-cinderclient (1:1.0.1.2.g9201cee-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Chuck Short ]
   * New upstream release.
 
- -- Chuck Short <[e-mail]>  Wed, 21 Nov 2012 11:30:55 -0600
+  [ Yolanda Robla ]
+  * debian/patches/avoid_setuptools_git_dependency.patch: Drop requirement for 
+    python-setuptools-git during build process.
+  * debian/copyright: Removed remaining dh boilerplate template.
+
+ -- Yolanda Robla <[e-mail]>  Mon, 10 Dec 2012 17:02:00 +0100
 
 python-cinderclient (1:1.0.0-0ubuntu1) quantal; urgency=low
 

=== modified file 'debian/copyright'
--- debian/copyright	2012-06-27 17:40:10 +0000
+++ debian/copyright	2012-12-10 16:33:22 +0000
@@ -41,8 +41,3 @@
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.

=== added file 'debian/patches/avoid_setuptools_git_dependency.patch'
--- debian/patches/avoid_setuptools_git_dependency.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/avoid_setuptools_git_dependency.patch	2012-12-10 16:33:22 +0000
@@ -0,0 +1,16 @@
+Description: Drop requirement for python-setuptools-git during build process.
+Origin:      upstream
+Author:      Yolanda Robla <[e-mail]>
+Last-Update: 2012-12-10
+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=[

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