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

Proposed by Yolanda Robla on 2012-12-10
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 2012-12-10 Approve on 2012-12-10
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.
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-21 17:31:21 +0000
3+++ debian/changelog 2012-12-10 16:33:22 +0000
4@@ -1,8 +1,14 @@
5-python-cinderclient (1:1.0.0.16.g79dc21d-0ubuntu1) UNRELEASED; urgency=low
6+python-cinderclient (1:1.0.1.2.g9201cee-0ubuntu1) UNRELEASED; urgency=low
7
8+ [ Chuck Short ]
9 * New upstream release.
10
11- -- Chuck Short <zulcss@ubuntu.com> Wed, 21 Nov 2012 11:30:55 -0600
12+ [ Yolanda Robla ]
13+ * debian/patches/avoid_setuptools_git_dependency.patch: Drop requirement for
14+ python-setuptools-git during build process.
15+ * debian/copyright: Removed remaining dh boilerplate template.
16+
17+ -- Yolanda Robla <yolanda.robla@canonical.com> Mon, 10 Dec 2012 17:02:00 +0100
18
19 python-cinderclient (1:1.0.0-0ubuntu1) quantal; urgency=low
20
21
22=== modified file 'debian/copyright'
23--- debian/copyright 2012-06-27 17:40:10 +0000
24+++ debian/copyright 2012-12-10 16:33:22 +0000
25@@ -41,8 +41,3 @@
26 .
27 On Debian systems, the complete text of the GNU General
28 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
29-
30-# Please also look if there are files or directories which have a
31-# different copyright/license attached and list them here.
32-# Please avoid to pick license terms that are more restrictive than the
33-# packaged work, as it may make Debian's contributions unacceptable upstream.
34
35=== added file 'debian/patches/avoid_setuptools_git_dependency.patch'
36--- debian/patches/avoid_setuptools_git_dependency.patch 1970-01-01 00:00:00 +0000
37+++ debian/patches/avoid_setuptools_git_dependency.patch 2012-12-10 16:33:22 +0000
38@@ -0,0 +1,16 @@
39+Description: Drop requirement for python-setuptools-git during build process.
40+Origin: upstream
41+Author: Yolanda Robla <yolanda.robla@canonical.com>
42+Last-Update: 2012-12-10
43+Index: python-cinderclient/setup.py
44+===================================================================
45+--- python-cinderclient.orig/setup.py 2012-12-10 16:12:45.931742694 +0000
46++++ python-cinderclient/setup.py 2012-12-10 16:13:05.219739811 +0000
47+@@ -41,7 +41,6 @@
48+ cmdclass=setup.get_cmdclass(),
49+ install_requires=requires,
50+ tests_require=tests_require,
51+- setup_requires=['setuptools-git>=0.4'],
52+ dependency_links=depend_links,
53+ test_suite="nose.collector",
54+ classifiers=[
55
56=== added file 'debian/patches/series'
57--- debian/patches/series 1970-01-01 00:00:00 +0000
58+++ debian/patches/series 2012-12-10 16:33:22 +0000
59@@ -0,0 +1,1 @@
60+avoid_setuptools_git_dependency.patch

Subscribers

People subscribed via source and target branches