Launchpad itself

Merge lp:~stevenk/launchpad/3102-by-default into lp:launchpad

  1. 3102-by-default
  2. Merge into devel
Proposed by Steve Kowalik
Status: Merged
Approved by: Steve Kowalik
Approved revision: no longer in the source branch.
Merged at revision: 16694
Proposed branch: lp:~stevenk/launchpad/3102-by-default
Merge into: lp:launchpad
Diff against target: 28 lines (+3/-3)
2 files modified
Makefile (+2/-2)
buildout-templates/bin/combine-css.in (+1/-1)
To merge this branch: bzr merge lp:~stevenk/launchpad/3102-by-default
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+172937@code.launchpad.net

Commit message

Stop building YUI 3.9.1, and switch the default YUI version to 3.10.2.

Description of the change

Stop building YUI 3.9.1, and switch the default YUI version to 3.10.2. This necessitated a change in combine-css's buildout template, as one of the CSS filenames has changed.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2013-06-06 04:05:38 +0000
3+++ Makefile 2013-07-04 01:23:27 +0000
4@@ -23,9 +23,9 @@
5 LP_BUILT_JS_ROOT=${ICING}/build
6
7 JS_BUILD_DIR := build/js
8-YUI_VERSIONS := 3.9.1 3.10.2
9+YUI_VERSIONS := 3.10.2
10 YUI_BUILDS := $(patsubst %,$(JS_BUILD_DIR)/yui-%, $(YUI_VERSIONS))
11-YUI_DEFAULT := yui-3.9.1
12+YUI_DEFAULT := yui-3.10.2
13 YUI_DEFAULT_SYMLINK := $(JS_BUILD_DIR)/yui
14 LP_JS_BUILD := $(JS_BUILD_DIR)/lp
15
16
17=== modified file 'buildout-templates/bin/combine-css.in'
18--- buildout-templates/bin/combine-css.in 2013-04-22 06:31:23 +0000
19+++ buildout-templates/bin/combine-css.in 2013-07-04 01:23:27 +0000
20@@ -22,7 +22,7 @@
21 names = [
22 'ubuntu-webfonts.css',
23 'style.css',
24- 'yui/cssreset/reset.css',
25+ 'yui/cssreset/cssreset.css',
26 'yui/assets/skins/sam/calendar-base.css',
27 'yui/assets/skins/sam/calendar.css',
28 'yui/assets/skins/sam/calendarnavigator.css',