Glance

Merge lp:~zulcss/glance/glance-fix-ups into lp:~openstack-ubuntu-testing/glance/grizzly

  1. glance-fix-ups
  2. Merge into grizzly
Proposed by Chuck Short
Status: Merged
Merged at revision: 240
Proposed branch: lp:~zulcss/glance/glance-fix-ups
Merge into: lp:~openstack-ubuntu-testing/glance/grizzly
Diff against target: 100 lines (+25/-9)
4 files modified
debian/changelog (+16/-1)
debian/control (+4/-5)
debian/pydist-overrides (+0/-2)
debian/rules (+5/-1)
To merge this branch: bzr merge lp:~zulcss/glance/glance-fix-ups
Reviewer Review Type Date Requested Status
Adam Gandelman (community) Approve
Review via email: mp+152048@code.launchpad.net

Description of the change

glance clean and ftbfs

To post a comment you must log in.
Revision history for this message
Adam Gandelman (gandelman-a) wrote :

Some typos in changelog but LGTM otherwise.

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-03-01 14:14:47 +0000
3+++ debian/changelog 2013-03-06 20:11:25 +0000
4@@ -1,8 +1,23 @@
5-glance (2013.1.g3-0ubuntu2) UNRELEASED; urgency=low
6+glance (1:2013.1.a71.g47362d7-0ubuntu1) UNRELEASED; urgency=low
7
8+ [ James Page ]
9 * d/watch: Update uversionmangle to deal with upstream versioning
10 changes, remove tarballs.openstack.org.
11
12+ [ Chuck Short ]
13+ * New upstrem release
14+ * debian/control: Clean up build-dependencies:
15+ - Drop python-argparse referenced in pydist-overrides
16+ - Drop python-swift no longer needed.
17+ - Drop python-dateutils no longer needed.
18+ - Dropped python-glacneclient no longer needed.
19+ - Added python-anyjson to build-depends.
20+ - Use python-keystoneclient instead of python-keystone.
21+ - Added python-lxml to build-depends.
22+ - Added python-swiftclientto build-depends.
23+ - Added python-passlib to build-depends.
24+ * debian/rules: Set the PYTHONPATH for the tests.
25+
26 -- James Page <james.page@ubuntu.com> Fri, 01 Mar 2013 14:09:38 +0000
27
28 glance (2013.1.g3-0ubuntu1) raring; urgency=low
29
30=== modified file 'debian/control'
31--- debian/control 2013-02-20 14:58:17 +0000
32+++ debian/control 2013-03-06 20:11:25 +0000
33@@ -9,30 +9,29 @@
34 Build-Depends-Indep:
35 curl,
36 pep8,
37- python-argparse,
38 python-boto,
39 python-crypto,
40- python-dateutil,
41 python-eventlet,
42- python-glanceclient,
43 python-fixtures,
44 python-httplib2 (>= 0.6.0),
45 python-iso8601,
46+ python-anyjson,
47 python-jsonschema,
48- python-keystone,
49+ python-keystoneclient,
50 python-kombu,
51+ python-lxml,
52 python-migrate,
53 python-mox,
54 python-nose,
55 python-oslo-config,
56 python-paste,
57 python-pastedeploy,
58+ python-passlib,
59 python-requests,
60 python-routes,
61 python-setuptools,
62 python-sphinx,
63 python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
64- python-swift,
65 python-swiftclient,
66 python-testtools,
67 python-webob,
68
69=== modified file 'debian/pydist-overrides'
70--- debian/pydist-overrides 2012-06-22 13:57:11 +0000
71+++ debian/pydist-overrides 2013-03-06 20:11:25 +0000
72@@ -1,4 +1,2 @@
73 pysendfile
74-jsonschema
75 argparse
76-python_swiftclient
77
78=== modified file 'debian/rules'
79--- debian/rules 2013-01-23 00:34:18 +0000
80+++ debian/rules 2013-03-06 20:11:25 +0000
81@@ -3,6 +3,10 @@
82 # Verbose mode
83 #export DH_VERBOSE=1
84
85+DEBVERS ?= $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
86+VERSION ?= $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//')
87+export OSLO_PACKAGE_VERSION=$(VERSION)
88+
89 %:
90 dh $@ --with python2
91
92@@ -16,7 +20,7 @@
93 override_dh_auto_test:
94 # Scope tests to glance/tests otherwise we get a weird
95 # nose test failure about glance/openstack/common
96- python setup.py test
97+ PYTHONPATH=$(CURDIR) python setup.py test
98 endif
99
100 override_dh_auto_build:

Subscribers

People subscribed via source and target branches