Merge lp:~corey.bryant/horizon/2015.1-b1 into lp:~ubuntu-server-dev/horizon/kilo

Proposed by Corey Bryant
Status: Merged
Merged at revision: 216
Proposed branch: lp:~corey.bryant/horizon/2015.1-b1
Merge into: lp:~ubuntu-server-dev/horizon/kilo
Diff against target: 150 lines (+62/-28)
3 files modified
debian/changelog (+9/-2)
debian/control (+52/-25)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~corey.bryant/horizon/2015.1-b1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+246314@code.launchpad.net
To post a comment you must log in.
lp:~corey.bryant/horizon/2015.1-b1 updated
216. By James Page

releasing package horizon version 1:2015.1~b1-0ubuntu1

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 2014-11-21 20:12:28 +0000
3+++ debian/changelog 2015-01-13 15:13:29 +0000
4@@ -1,11 +1,18 @@
5-horizon (1:2014.2-0ubuntu2) UNRELEASED; urgency=medium
6+horizon (2015.1~b1-0ubuntu1) UNRELEASED; urgency=medium
7
8+ [ Chuck Short ]
9 * Open for Kilo.
10 * debian/control: Update bzr branches
11 * debian/patches/embedded-xstatic.patch: Refreshed
12 * debian/patches/add-juju-environment-download.patch: Temporarily disabled.
13
14- -- Chuck Short <zulcss@ubuntu.com> Tue, 28 Oct 2014 09:33:27 -0400
15+ [ Corey Bryant ]
16+ * New upstream release.
17+ - d/control: Align requirements with upstream.
18+ - d/watch: Update uversionmangle for kilo beta naming.
19+ * d/control: Bumped Standards-Version to 3.9.6.
20+
21+ -- Corey Bryant <corey.bryant@canonical.com> Mon, 05 Jan 2015 16:42:06 -0500
22
23 horizon (1:2014.2-0ubuntu1) utopic; urgency=medium
24
25
26=== modified file 'debian/control'
27--- debian/control 2014-10-28 13:33:50 +0000
28+++ debian/control 2015-01-13 15:13:29 +0000
29@@ -5,31 +5,49 @@
30 Build-Depends:
31 debhelper (>= 8.0.0),
32 python-all (>= 2.6.6-3~),
33+ python-babel (>= 1.3),
34 python-ceilometerclient (>= 1.0.6),
35- python-cinderclient (>= 1:1.0.7),
36+ python-cinderclient (>= 1:1.1.0),
37 python-compressor (>= 1.3),
38- python-django (>= 1.4),
39+ python-coverage (>= 3.6),
40+ python-django (>= 1.4.2),
41 python-django-pyscss (>= 1.0.3),
42- python-glanceclient (>= 1:0.13.1),
43+ python-eventlet (>= 0.15.2),
44+ python-glanceclient (>= 1:0.15.0),
45+ python-hacking (>= 0.9.2),
46 python-heatclient (>= 0.2.9),
47+ python-httplib2 (>= 0.7.5),
48 python-iso8601 (>= 0.1.9),
49- python-keystoneclient (>= 1:0.10.0),
50- python-lockfile,
51+ python-keystoneclient (>= 1:0.11.1),
52+ python-kombu (>= 2.5.0),
53+ python-lockfile (>= 0.8),
54 python-memcache,
55- python-netaddr (>= 0.7.6),
56+ python-mock (>= 1.0),
57+ python-mox (>= 0.5.3),
58+ python-netaddr (>= 0.7.12),
59 python-neutronclient (>= 1:2.3.6),
60- python-novaclient (>= 1:2.17.0),
61- python-openstack-auth (>= 1.1.6),
62+ python-novaclient (>= 1:2.18.0),
63+ python-nose,
64+ python-nosexcover,
65+ python-openstack-auth (>= 1.1.7),
66+ python-oslo.config (>= 1:1.4.0),
67+ python-oslo.i18n (>= 1.0.0),
68+ python-oslo.serialization (>= 1.0.0),
69+ python-oslo.utils (>= 1.1.0),
70+ python-oslosphinx (>= 2.2.0),
71 python-pbr (>= 0.6),
72- python-pyscss (>= 1.2.1),
73- python-saharaclient (>= 0.7.1),
74+ python-pyscss (>= 1.0.3),
75+ python-saharaclient (>= 0.7.6),
76 python-setuptools,
77 python-six (>= 1.7.0),
78- python-sphinx,
79+ python-sphinx (>= 1.1.2),
80 python-swiftclient (>= 1:2.2.0),
81- python-troveclient (>= 1.0.4),
82- python-tz
83-Standards-Version: 3.9.5
84+ python-testtools (>= 0.9.36),
85+ python-troveclient (>= 1.0.7),
86+ python-tz,
87+ python-unittest2,
88+ python-yaml (>= 3.1.0),
89+Standards-Version: 3.9.6
90 Homepage: http://launchpad.net/horizon
91 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/horizon/kilo/files
92 Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/horizon/kilo
93@@ -38,28 +56,37 @@
94 Section: python
95 Architecture: all
96 Depends:
97+ python-babel (>= 1.3),
98 python-ceilometerclient (>= 1.0.6),
99- python-cinderclient (>= 1:1.0.7),
100+ python-cinderclient (>= 1:1.1.0),
101 python-compressor (>= 1.3),
102- python-django (>= 1.4),
103+ python-django (>= 1.4.2),
104 python-django-pyscss (>= 1.0.3),
105- python-glanceclient (>= 1:0.13.1),
106+ python-eventlet (>= 0.15.2),
107+ python-glanceclient (>= 1:0.15.0),
108 python-heatclient (>= 0.2.9),
109+ python-httplib2 (>= 0.7.5),
110 python-iso8601 (>= 0.1.9),
111- python-keystoneclient (>= 1:0.10.0),
112- python-lockfile,
113+ python-keystoneclient (>= 1:0.11.1),
114+ python-kombu (>= 2.5.0),
115+ python-lockfile (>= 0.8),
116 python-memcache,
117- python-netaddr (>= 0.7.6),
118+ python-netaddr (>= 0.7.12),
119 python-neutronclient (>= 1:2.3.6),
120- python-novaclient (>= 1:2.17.0),
121- python-openstack-auth (>= 1.1.6),
122+ python-novaclient (>= 1:2.18.0),
123+ python-openstack-auth (>= 1.1.7),
124+ python-oslo.config (>= 1:1.4.0),
125+ python-oslo.i18n (>= 1.0.0),
126+ python-oslo.serialization (>= 1.0.0),
127+ python-oslo.utils (>= 1.1.0),
128 python-pbr (>= 0.6),
129- python-pyscss (>= 1.2.1),
130- python-saharaclient (>= 0.7.1),
131+ python-pyscss (>= 1.0.3),
132+ python-saharaclient (>= 0.7.6),
133 python-six (>= 1.7.0),
134 python-swiftclient (>= 1:2.2.0),
135- python-troveclient (>= 1.0.4),
136+ python-troveclient (>= 1.0.7),
137 python-tz,
138+ python-yaml (>= 3.1.0),
139 ${misc:Depends},
140 ${python:Depends}
141 Recommends: memcached
142
143=== modified file 'debian/watch'
144--- debian/watch 2014-10-13 10:42:21 +0000
145+++ debian/watch 2015-01-13 15:13:29 +0000
146@@ -1,3 +1,3 @@
147 version=3
148-opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
149+opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/;s/\.0b/~b/" \
150 http://tarballs.openstack.org/horizon horizon-(\d.*)\.tar\.gz

Subscribers

People subscribed via source and target branches