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

Proposed by Steve Kowalik
Status: Merged
Approved by: Steve Kowalik
Approved revision: no longer in the source branch.
Merged at revision: 16573
Proposed branch: lp:~stevenk/launchpad/391-by-default
Merge into: lp:launchpad
Diff against target: 15 lines (+2/-2)
1 file modified
Makefile (+2/-2)
To merge this branch: bzr merge lp:~stevenk/launchpad/391-by-default
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+159546@code.launchpad.net

Commit message

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

Description of the change

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

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-04-18 02:58:51 +0000
3+++ Makefile 2013-04-18 04:49:29 +0000
4@@ -23,10 +23,10 @@
5 LP_BUILT_JS_ROOT=${ICING}/build
6
7 JS_BUILD_DIR := build/js
8-YUI_VERSIONS := 3.5.1 3.9.1
9+YUI_VERSIONS := 3.9.1
10 YUI_BUILDS := $(patsubst %,$(JS_BUILD_DIR)/yui-%, $(YUI_VERSIONS))
11 YUI2_BUILD:= $(JS_BUILD_DIR)/yui2
12-YUI_DEFAULT := yui-3.5.1
13+YUI_DEFAULT := yui-3.9.1
14 YUI_DEFAULT_SYMLINK := $(JS_BUILD_DIR)/yui
15 LP_JS_BUILD := $(JS_BUILD_DIR)/lp
16