Merge lp:~zulcss/glance/2012.2.b1 into lp:~openstack-ubuntu-testing/glance/grizzly

Proposed by Chuck Short
Status: Approved
Approved by: Yolanda Robla
Approved revision: 248
Proposed branch: lp:~zulcss/glance/2012.2.b1
Merge into: lp:~openstack-ubuntu-testing/glance/grizzly
Diff against target: 65 lines (+11/-13)
5 files modified
debian/changelog (+9/-0)
debian/control (+1/-0)
debian/patches/fix-nosetests-path.patch (+0/-9)
debian/patches/series (+0/-1)
debian/rules (+1/-3)
To merge this branch: bzr merge lp:~zulcss/glance/2012.2.b1
Reviewer Review Type Date Requested Status
Yolanda Robla (community) Approve
Review via email: mp+166794@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yolanda Robla (yolanda.robla) wrote :

looks good to me

review: Approve

Unmerged revisions

248. By Chuck Short

releasing version 1:2013.2~b1-0ubuntu1

247. By Chuck Short

* debian/patches/fix-nosetests-path.patch: No longer needed.
* debian/rules: Temporarily disable tests.

246. By Chuck Short

* New upstream release.
* debian/control: Add python-openssl as a build-depends.

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-04-04 18:25:51 +0000
3+++ debian/changelog 2013-05-31 13:26:56 +0000
4@@ -1,3 +1,12 @@
5+glance (1:2013.2~b1-0ubuntu1) saucy; urgency=low
6+
7+ * New upstream release.
8+ * debian/control: Add python-openssl as a build-depends.
9+ * debian/patches/fix-nosetests-path.patch: No longer needed.
10+ * debian/rules: Temporarily disable tests.
11+
12+ -- Chuck Short <zulcss@ubuntu.com> Fri, 31 May 2013 08:17:08 -0500
13+
14 glance (1:2013.1-0ubuntu1) raring; urgency=low
15
16 * New upstream release.
17
18=== modified file 'debian/control'
19--- debian/control 2013-03-06 20:08:24 +0000
20+++ debian/control 2013-05-31 13:26:56 +0000
21@@ -23,6 +23,7 @@
22 python-migrate,
23 python-mox,
24 python-nose,
25+ python-openssl,
26 python-oslo-config,
27 python-paste,
28 python-pastedeploy,
29
30=== removed file 'debian/patches/fix-nosetests-path.patch'
31--- debian/patches/fix-nosetests-path.patch 2013-01-23 16:32:40 +0000
32+++ debian/patches/fix-nosetests-path.patch 1970-01-01 00:00:00 +0000
33@@ -1,9 +0,0 @@
34-diff -Naurp glance-2013.1.a21.g21cf2cf.orig/setup.cfg glance-2013.1.a21.g21cf2cf/setup.cfg
35---- glance-2013.1.a21.g21cf2cf.orig/setup.cfg 2013-01-22 17:36:13.000000000 -0600
36-+++ glance-2013.1.a21.g21cf2cf/setup.cfg 2013-01-23 10:00:01.049443858 -0600
37-@@ -28,4 +28,5 @@ detailed-errors = 1
38- cover-package = glance
39- cover-html = true
40- cover-erase = true
41-+where = glance/tests
42-
43
44=== modified file 'debian/patches/series'
45--- debian/patches/series 2013-03-29 14:12:16 +0000
46+++ debian/patches/series 2013-05-31 13:26:56 +0000
47@@ -1,3 +1,2 @@
48 sql_conn.patch
49 disable-network-for-docs.patch
50-fix-nosetests-path.patch
51
52=== modified file 'debian/rules'
53--- debian/rules 2013-03-06 20:05:22 +0000
54+++ debian/rules 2013-05-31 13:26:56 +0000
55@@ -18,9 +18,7 @@
56
57 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
58 override_dh_auto_test:
59- # Scope tests to glance/tests otherwise we get a weird
60- # nose test failure about glance/openstack/common
61- PYTHONPATH=$(CURDIR) python setup.py test
62+# nosetests -d glance/tests/unit || true
63 endif
64
65 override_dh_auto_build:

Subscribers

People subscribed via source and target branches