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
Approved by: Chuck Short on 2012-12-10
Approved revision: 17
Merged at revision: 15
Proposed branch: lp:~yolanda.robla/python-cinderclient/grizzly-fix-setuptools-git
Merge into: lp:~ubuntu-server-dev/python-cinderclient/grizzly
Diff against target: 56 lines (+3/-22)
4 files modified
debian/changelog (+1/-2)
debian/control (+2/-1)
debian/patches/avoid_setuptools_git_dependency.patch (+0/-18)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~yolanda.robla/python-cinderclient/grizzly-fix-setuptools-git
Reviewer Review Type Date Requested Status
Chuck Short 2012-12-10 Pending
Review via email: mp+139066@code.launchpad.net

Description of the change

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

To post a comment you must log in.

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-12-10 16:36:15 +0000
3+++ debian/changelog 2012-12-10 18:26:27 +0000
4@@ -4,8 +4,7 @@
5 * New upstream release.
6
7 [ Yolanda Robla ]
8- * debian/patches/avoid_setuptools_git_dependency.patch: Drop requirement for
9- python-setuptools-git during build process.
10+ * debian/control: add python-setuptools-git dependency
11 * debian/copyright: Removed remaining dh boilerplate template.
12
13 -- Yolanda Robla <yolanda.robla@canonical.com> Mon, 10 Dec 2012 17:02:00 +0100
14
15=== modified file 'debian/control'
16--- debian/control 2012-09-19 21:33:52 +0000
17+++ debian/control 2012-12-10 18:26:27 +0000
18@@ -11,7 +11,8 @@
19 python-mock,
20 pep8,
21 python-sphinx,
22- python-unittest2
23+ python-unittest2,
24+ python-setuptools-git (>= 0.4)
25 Standards-Version: 3.9.3
26 X-Python-Version: >= 2.5
27
28
29=== removed file 'debian/patches/avoid_setuptools_git_dependency.patch'
30--- debian/patches/avoid_setuptools_git_dependency.patch 2012-12-10 16:36:15 +0000
31+++ debian/patches/avoid_setuptools_git_dependency.patch 1970-01-01 00:00:00 +0000
32@@ -1,18 +0,0 @@
33-Description: Drop requirement for python-setuptools-git during build process.
34- This is used during the upstream python build process and it not
35- required to build the package for Ubuntu.
36-Author: Yolanda Robla <yolanda.robla@canonical.com>
37-Forwarded: not-needed
38-
39-Index: python-cinderclient/setup.py
40-===================================================================
41---- python-cinderclient.orig/setup.py 2012-12-10 16:12:45.931742694 +0000
42-+++ python-cinderclient/setup.py 2012-12-10 16:13:05.219739811 +0000
43-@@ -41,7 +41,6 @@
44- cmdclass=setup.get_cmdclass(),
45- install_requires=requires,
46- tests_require=tests_require,
47-- setup_requires=['setuptools-git>=0.4'],
48- dependency_links=depend_links,
49- test_suite="nose.collector",
50- classifiers=[
51
52=== removed file 'debian/patches/series'
53--- debian/patches/series 2012-12-10 16:24:49 +0000
54+++ debian/patches/series 1970-01-01 00:00:00 +0000
55@@ -1,1 +0,0 @@
56-avoid_setuptools_git_dependency.patch

Subscribers

People subscribed via source and target branches