Merge lp:~zulcss/horizon/2013.2.rc2 into lp:~ubuntu-server-dev/horizon/havana

Proposed by Chuck Short
Status: Merged
Approved by: Chuck Short
Approved revision: 179
Merged at revision: 178
Proposed branch: lp:~zulcss/horizon/2013.2.rc2
Merge into: lp:~ubuntu-server-dev/horizon/havana
Diff against target: 27 lines (+10/-1)
2 files modified
debian/README.compression (+2/-1)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~zulcss/horizon/2013.2.rc2
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+191202@code.launchpad.net

Description of the change

2013.2.rc2

To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

9 + sudo apt-get install python-lesscpy python-openstack-auth python-compressor
10 + quilt pop top

\t -> spaces please

The static assets don't actually look to have changed; please verify and if that is the case, I suggest we drop that part of the delta.

review: Needs Fixing
Revision history for this message
James Page (james-page) :
review: Approve
Revision history for this message
Chuck Short (zulcss) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/README.compression'
2--- debian/README.compression 2013-07-22 16:29:56 +0000
3+++ debian/README.compression 2013-10-15 14:34:57 +0000
4@@ -1,5 +1,6 @@
5 Until this can be scripted and integrated into package build, updating the
6 pre-compressed static CSS and JS requires a some manual steps:
7
8- sudo apt-get install node-less nodejs-legacy python-openstack-auth python-compressor
9+ sudo apt-get install python-lesscpy python-openstack-auth python-compressor
10+ quilt pop top
11 ./debian/rules refresh-static-assets
12
13=== modified file 'debian/changelog'
14--- debian/changelog 2013-10-04 13:45:00 +0000
15+++ debian/changelog 2013-10-15 14:34:57 +0000
16@@ -1,3 +1,11 @@
17+horizon (1:2013.2~rc2-0ubuntu1) saucy; urgency=low
18+
19+ * New upstream release candidate. (#1239156)
20+ * debian/README.compression: Updated documenation on how to
21+ refresh the static assets.
22+
23+ -- Chuck Short <zulcss@ubuntu.com> Tue, 15 Oct 2013 10:20:05 -0400
24+
25 horizon (1:2013.2~rc1-0ubuntu2) saucy; urgency=low
26
27 * d/theme/css/ubuntu.css: Refresh Ubuntu theme against new Havana

Subscribers

People subscribed via source and target branches