Merge lp:~zulcss/nova/nova-cleanup into lp:~openstack-ubuntu-testing/nova/grizzly

Proposed by Chuck Short
Status: Merged
Approved by: Yolanda Robla
Approved revision: 560
Merged at revision: 560
Proposed branch: lp:~zulcss/nova/nova-cleanup
Merge into: lp:~openstack-ubuntu-testing/nova/grizzly
Diff against target: 92 lines (+19/-22)
3 files modified
debian/changelog (+15/-0)
debian/control (+0/-7)
debian/patches/avoid_setuptools_git_dependency.patch (+4/-15)
To merge this branch: bzr merge lp:~zulcss/nova/nova-cleanup
Reviewer Review Type Date Requested Status
Yolanda Robla (community) Approve
Review via email: mp+151057@code.launchpad.net

Description of the change

fixes ftbfs and cleans up build-depends

To post a comment you must log in.
Revision history for this message
Yolanda Robla (yolanda.robla) wrote :

Looks good to me

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 2013-02-22 15:27:32 +0000
3+++ debian/changelog 2013-02-28 17:03:19 +0000
4@@ -1,3 +1,18 @@
5+nova (2013.1.a4723.ge807e19-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream release.
8+ * debian/patches/avoid_setuptools_git_dependency.patch: Refreshed.
9+ * debian/control: Clean up dependencies:
10+ - Dropped python-gflags no longer needed.
11+ - Dropped python-daemon no longer needed.
12+ - Dropped python-glance no longer needed.
13+ - Dropped python-lockfile no longer needed.
14+ - Dropped python-simplejson no longer needed.
15+ - Dropped python-tempita no longer needed.
16+ - Dropped python-xattr no longer needed.
17+
18+ -- Chuck Short <zulcss@ubuntu.com> Thu, 28 Feb 2013 09:00:15 -0600
19+
20 nova (2013.1.g3-0ubuntu1) raring; urgency=low
21
22 [ Chuck Short ]
23
24=== modified file 'debian/control'
25--- debian/control 2013-02-20 16:01:42 +0000
26+++ debian/control 2013-02-28 17:03:19 +0000
27@@ -16,17 +16,13 @@
28 python-cinderclient,
29 python-coverage,
30 python-crypto,
31- python-daemon,
32 python-distutils-extra,
33 python-eventlet,
34 python-fixtures (>= 0.3.12),
35 python-feedparser,
36- python-gflags,
37- python-glance,
38 python-glanceclient,
39 python-iso8601,
40 python-kombu,
41- python-lockfile,
42 python-lxml,
43 python-migrate,
44 python-mox,
45@@ -41,16 +37,13 @@
46 python-routes,
47 python-setuptools,
48 python-setuptools-git,
49- python-simplejson,
50 python-stevedore (>= 0.7.2),
51 python-sphinx (>> 1.0),
52 python-sqlalchemy-ext ( >= 0.7.8-1~) | python-sqlalchemy (<< 0.6.3-2),
53 python-suds,
54- python-tempita,
55 python-testtools (>= 0.9.22),
56 python-unittest2,
57 python-webob (>= 1.2.3),
58- python-xattr,
59 pep8,
60 testrepository ( >= 0.0.8)
61 Build-Conflicts: python-cjson
62
63=== modified file 'debian/patches/avoid_setuptools_git_dependency.patch'
64--- debian/patches/avoid_setuptools_git_dependency.patch 2013-02-20 15:36:21 +0000
65+++ debian/patches/avoid_setuptools_git_dependency.patch 2013-02-28 17:03:19 +0000
66@@ -1,22 +1,11 @@
67-diff -Naurp nova-2013.1.a4539.g032308c.orig/setup.py nova-2013.1.a4539.g032308c/setup.py
68---- nova-2013.1.a4539.g032308c.orig/setup.py 2013-02-20 09:26:49.000000000 -0600
69-+++ nova-2013.1.a4539.g032308c/setup.py 2013-02-20 09:34:57.313915950 -0600
70-@@ -46,7 +46,6 @@ setuptools.setup(
71- dependency_links=depend_links,
72- include_package_data=True,
73- test_suite='nose.collector',
74-- setup_requires=['setuptools_git>=0.4'],
75- scripts=['bin/nova-all',
76- 'bin/nova-api',
77- 'bin/nova-api-ec2',
78-diff -Naurp nova-2013.1.a4539.g032308c.orig/tools/pip-requires nova-2013.1.a4539.g032308c/tools/pip-requires
79---- nova-2013.1.a4539.g032308c.orig/tools/pip-requires 2013-02-20 09:26:49.000000000 -0600
80-+++ nova-2013.1.a4539.g032308c/tools/pip-requires 2013-02-20 09:35:08.525916217 -0600
81+diff -Naurp nova-2013.1.a4723.ge807e19.orig/tools/pip-requires nova-2013.1.a4723.ge807e19/tools/pip-requires
82+--- nova-2013.1.a4723.ge807e19.orig/tools/pip-requires 2013-02-28 08:59:17.000000000 -0600
83++++ nova-2013.1.a4723.ge807e19/tools/pip-requires 2013-02-28 09:01:41.143142227 -0600
84 @@ -20,7 +20,6 @@ pyasn1
85 Babel>=0.9.6
86 iso8601>=0.1.4
87 httplib2
88 -setuptools_git>=0.4
89 python-cinderclient>=1.0.1
90- python-quantumclient>=2.1
91+ python-quantumclient>=2.1.2
92 python-glanceclient>=0.5.0,<2

Subscribers

People subscribed via source and target branches