python-cinderclient

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

  1. grizzly-fix-setuptools-git
  2. Merge into grizzly
Proposed by Yolanda Robla
Status: Merged
Merged at revision: 14
Proposed branch: lp:~yolanda.robla/python-cinderclient/grizzly-fix-setuptools-git
Merge into: lp:~ubuntu-server-dev/python-cinderclient/grizzly
Diff against target: 60 lines (+25/-7)
4 files modified
debian/changelog (+8/-2)
debian/copyright (+0/-5)
debian/patches/avoid_setuptools_git_dependency.patch (+16/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~yolanda.robla/python-cinderclient/grizzly-fix-setuptools-git
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+139025@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1python-cinderclient (1:1.0.0.16.g79dc21d-0ubuntu1) UNRELEASED; urgency=low1python-cinderclient (1:1.0.1.2.g9201cee-0ubuntu1) UNRELEASED; urgency=low
22
3 [ Chuck Short ]
3 * New upstream release.4 * New upstream release.
45
5 -- Chuck Short <zulcss@ubuntu.com> Wed, 21 Nov 2012 11:30:55 -06006 [ Yolanda Robla ]
7 * debian/patches/avoid_setuptools_git_dependency.patch: Drop requirement for
8 python-setuptools-git during build process.
9 * debian/copyright: Removed remaining dh boilerplate template.
10
11 -- Yolanda Robla <yolanda.robla@canonical.com> Mon, 10 Dec 2012 17:02:00 +0100
612
7python-cinderclient (1:1.0.0-0ubuntu1) quantal; urgency=low13python-cinderclient (1:1.0.0-0ubuntu1) quantal; urgency=low
814
915
=== 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 @@
41 .41 .
42 On Debian systems, the complete text of the GNU General42 On Debian systems, the complete text of the GNU General
43 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".43 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
44
45# Please also look if there are files or directories which have a
46# different copyright/license attached and list them here.
47# Please avoid to pick license terms that are more restrictive than the
48# packaged work, as it may make Debian's contributions unacceptable upstream.
4944
=== 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 @@
1Description: Drop requirement for python-setuptools-git during build process.
2Origin: upstream
3Author: Yolanda Robla <yolanda.robla@canonical.com>
4Last-Update: 2012-12-10
5Index: python-cinderclient/setup.py
6===================================================================
7--- python-cinderclient.orig/setup.py 2012-12-10 16:12:45.931742694 +0000
8+++ python-cinderclient/setup.py 2012-12-10 16:13:05.219739811 +0000
9@@ -41,7 +41,6 @@
10 cmdclass=setup.get_cmdclass(),
11 install_requires=requires,
12 tests_require=tests_require,
13- setup_requires=['setuptools-git>=0.4'],
14 dependency_links=depend_links,
15 test_suite="nose.collector",
16 classifiers=[
017
=== 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 @@
1avoid_setuptools_git_dependency.patch

Subscribers

People subscribed via source and target branches