Ubuntu
jquery package

Merge lp:~noskcaj/ubuntu/trusty/jquery/merge into lp:ubuntu/trusty/jquery

  1. Trusty (14.04)
  2. merge
  3. Merge into trusty
Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp:~noskcaj/ubuntu/trusty/jquery/merge
Merge into: lp:ubuntu/trusty/jquery
Diff against target: 442 lines (+35/-297)
12 files modified
.pc/applied-patches (+0/-2)
.pc/build.patch/Makefile (+0/-137)
.pc/no-min.diff/Makefile (+0/-137)
Makefile (+4/-4)
debian/changelog (+18/-0)
debian/control (+2/-2)
debian/links (+0/-1)
debian/patches/build.patch (+9/-2)
debian/patches/no-min.diff (+0/-11)
debian/patches/series (+0/-1)
debian/rules (+1/-0)
debian/source.lintian-overrides (+1/-0)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/trusty/jquery/merge
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Needs Fixing
Review via email: mp+199590@code.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

This adds node-uglify as build-dep, which is in universe. We either need to work around it or follow https://wiki.ubuntu.com/MainInclusionProcess

review: Needs Fixing
Reply

Unmerged revisions

22. By Jackson Doak

* Merge from debian. Remaining change:
  - debian/control: Suggest rather than recommend javascript-common;
    it's in universe and we don't necessarily need to publish these
    scripts via http

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file '.pc/applied-patches'
2--- .pc/applied-patches 2012-08-04 08:26:20 +0000
3+++ .pc/applied-patches 1970-01-01 00:00:00 +0000
4@@ -1,2 +0,0 @@
5-build.patch
6-no-min.diff
7
8=== removed directory '.pc/build.patch'
9=== removed file '.pc/build.patch/Makefile'
10--- .pc/build.patch/Makefile 2012-05-22 21:26:51 +0000
11+++ .pc/build.patch/Makefile 1970-01-01 00:00:00 +0000
12@@ -1,137 +0,0 @@
13-SRC_DIR = src
14-TEST_DIR = test
15-BUILD_DIR = build
16-
17-PREFIX = .
18-DIST_DIR = ${PREFIX}/dist
19-
20-JS_ENGINE ?= `which node nodejs 2>/dev/null`
21-COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe
22-POST_COMPILER = ${JS_ENGINE} ${BUILD_DIR}/post-compile.js
23-
24-BASE_FILES = ${SRC_DIR}/core.js\
25- ${SRC_DIR}/callbacks.js\
26- ${SRC_DIR}/deferred.js\
27- ${SRC_DIR}/support.js\
28- ${SRC_DIR}/data.js\
29- ${SRC_DIR}/queue.js\
30- ${SRC_DIR}/attributes.js\
31- ${SRC_DIR}/event.js\
32- ${SRC_DIR}/selector.js\
33- ${SRC_DIR}/traversing.js\
34- ${SRC_DIR}/manipulation.js\
35- ${SRC_DIR}/css.js\
36- ${SRC_DIR}/ajax.js\
37- ${SRC_DIR}/ajax/jsonp.js\
38- ${SRC_DIR}/ajax/script.js\
39- ${SRC_DIR}/ajax/xhr.js\
40- ${SRC_DIR}/effects.js\
41- ${SRC_DIR}/offset.js\
42- ${SRC_DIR}/dimensions.js\
43- ${SRC_DIR}/exports.js
44-
45-MODULES = ${SRC_DIR}/intro.js\
46- ${BASE_FILES}\
47- ${SRC_DIR}/outro.js
48-
49-JQ = ${DIST_DIR}/jquery.js
50-JQ_MIN = ${DIST_DIR}/jquery.min.js
51-
52-SIZZLE_DIR = ${SRC_DIR}/sizzle
53-
54-JQ_VER = $(shell cat version.txt)
55-VER = sed "s/@VERSION/${JQ_VER}/"
56-
57-DATE=$(shell git log -1 --pretty=format:%ad)
58-
59-all: update_submodules core
60-
61-core: jquery min hint size
62- @@echo "jQuery build complete."
63-
64-${DIST_DIR}:
65- @@mkdir -p ${DIST_DIR}
66-
67-jquery: ${JQ}
68-
69-${JQ}: ${MODULES} | ${DIST_DIR}
70- @@echo "Building" ${JQ}
71-
72- @@cat ${MODULES} | \
73- sed 's/.function..jQuery...{//' | \
74- sed 's/}...jQuery..;//' | \
75- sed 's/@DATE/'"${DATE}"'/' | \
76- ${VER} > ${JQ};
77-
78-${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js
79- @@echo "Building selector code from Sizzle"
80- @@sed '/EXPOSE/r src/sizzle-jquery.js' ${SIZZLE_DIR}/sizzle.js | grep -v window.Sizzle > ${SRC_DIR}/selector.js
81-
82-hint: jquery
83- @@if test ! -z ${JS_ENGINE}; then \
84- echo "Checking jQuery against JSHint..."; \
85- ${JS_ENGINE} build/jshint-check.js; \
86- else \
87- echo "You must have NodeJS installed in order to test jQuery against JSHint."; \
88- fi
89-
90-size: jquery min
91- @@if test ! -z ${JS_ENGINE}; then \
92- gzip -c ${JQ_MIN} > ${JQ_MIN}.gz; \
93- wc -c ${JQ} ${JQ_MIN} ${JQ_MIN}.gz | ${JS_ENGINE} ${BUILD_DIR}/sizer.js; \
94- rm ${JQ_MIN}.gz; \
95- else \
96- echo "You must have NodeJS installed in order to size jQuery."; \
97- fi
98-
99-freq: jquery min
100- @@if test ! -z ${JS_ENGINE}; then \
101- ${JS_ENGINE} ${BUILD_DIR}/freq.js; \
102- else \
103- echo "You must have NodeJS installed to report the character frequency of minified jQuery."; \
104- fi
105-
106-min: jquery ${JQ_MIN}
107-
108-${JQ_MIN}: ${JQ}
109- @@if test ! -z ${JS_ENGINE}; then \
110- echo "Minifying jQuery" ${JQ_MIN}; \
111- ${COMPILER} ${JQ} > ${JQ_MIN}.tmp; \
112- ${POST_COMPILER} ${JQ_MIN}.tmp; \
113- rm -f ${JQ_MIN}.tmp; \
114- else \
115- echo "You must have NodeJS installed in order to minify jQuery."; \
116- fi
117-
118-clean:
119- @@echo "Removing Distribution directory:" ${DIST_DIR}
120- @@rm -rf ${DIST_DIR}
121-
122- @@echo "Removing built copy of Sizzle"
123- @@rm -f src/selector.js
124-
125-distclean: clean
126- @@echo "Removing submodules"
127- @@rm -rf test/qunit src/sizzle
128-
129-# change pointers for submodules and update them to what is specified in jQuery
130-# --merge doesn't work when doing an initial clone, thus test if we have non-existing
131-# submodules, then do an real update
132-update_submodules:
133- @@if [ -d .git ]; then \
134- if git submodule status | grep -q -E '^-'; then \
135- git submodule update --init --recursive; \
136- else \
137- git submodule update --init --recursive --merge; \
138- fi; \
139- fi;
140-
141-# update the submodules to the latest at the most logical branch
142-pull_submodules:
143- @@git submodule foreach "git pull \$$(git config remote.origin.url)"
144- @@git submodule summary
145-
146-pull: pull_submodules
147- @@git pull ${REMOTE} ${BRANCH}
148-
149-.PHONY: all jquery hint min clean distclean update_submodules pull_submodules pull core
150
151=== removed directory '.pc/no-min.diff'
152=== removed file '.pc/no-min.diff/Makefile'
153--- .pc/no-min.diff/Makefile 2012-08-04 08:26:20 +0000
154+++ .pc/no-min.diff/Makefile 1970-01-01 00:00:00 +0000
155@@ -1,137 +0,0 @@
156-SRC_DIR = src
157-TEST_DIR = test
158-BUILD_DIR = build
159-
160-PREFIX = .
161-DIST_DIR = ${PREFIX}/dist
162-
163-JS_ENGINE ?= `which node 2>/dev/null || which nodejs 2>/dev/null`
164-COMPILER = `which uglifyjs 2>/dev/null` --unsafe
165-POST_COMPILER = ${JS_ENGINE} ${BUILD_DIR}/post-compile.js
166-
167-BASE_FILES = ${SRC_DIR}/core.js\
168- ${SRC_DIR}/callbacks.js\
169- ${SRC_DIR}/deferred.js\
170- ${SRC_DIR}/support.js\
171- ${SRC_DIR}/data.js\
172- ${SRC_DIR}/queue.js\
173- ${SRC_DIR}/attributes.js\
174- ${SRC_DIR}/event.js\
175- ${SRC_DIR}/selector.js\
176- ${SRC_DIR}/traversing.js\
177- ${SRC_DIR}/manipulation.js\
178- ${SRC_DIR}/css.js\
179- ${SRC_DIR}/ajax.js\
180- ${SRC_DIR}/ajax/jsonp.js\
181- ${SRC_DIR}/ajax/script.js\
182- ${SRC_DIR}/ajax/xhr.js\
183- ${SRC_DIR}/effects.js\
184- ${SRC_DIR}/offset.js\
185- ${SRC_DIR}/dimensions.js\
186- ${SRC_DIR}/exports.js
187-
188-MODULES = ${SRC_DIR}/intro.js\
189- ${BASE_FILES}\
190- ${SRC_DIR}/outro.js
191-
192-JQ = ${DIST_DIR}/jquery.js
193-JQ_MIN = ${DIST_DIR}/jquery.min.js
194-
195-SIZZLE_DIR = ${SRC_DIR}/sizzle
196-
197-JQ_VER = $(shell cat version.txt)
198-VER = sed "s/@VERSION/${JQ_VER}/"
199-
200-DATE=$(shell date)
201-
202-all: update_submodules core
203-
204-core: jquery min hint size
205- @@echo "jQuery build complete."
206-
207-${DIST_DIR}:
208- @@mkdir -p ${DIST_DIR}
209-
210-jquery: ${JQ}
211-
212-${JQ}: ${MODULES} | ${DIST_DIR}
213- @@echo "Building" ${JQ}
214-
215- @@cat ${MODULES} | \
216- sed 's/.function..jQuery...{//' | \
217- sed 's/}...jQuery..;//' | \
218- sed 's/@DATE/'"${DATE}"'/' | \
219- ${VER} > ${JQ};
220-
221-${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js
222- @@echo "Building selector code from Sizzle"
223- @@sed '/EXPOSE/r src/sizzle-jquery.js' ${SIZZLE_DIR}/sizzle.js | grep -v window.Sizzle > ${SRC_DIR}/selector.js
224-
225-hint: jquery
226- @@if test ! -z ${JS_ENGINE}; then \
227- echo "Checking jQuery against JSHint..."; \
228- ${JS_ENGINE} build/jshint-check.js; \
229- else \
230- echo "You must have NodeJS installed in order to test jQuery against JSHint."; \
231- fi
232-
233-size: jquery min
234- @@if test ! -z ${JS_ENGINE}; then \
235- gzip -c ${JQ_MIN} > ${JQ_MIN}.gz; \
236- wc -c ${JQ} ${JQ_MIN} ${JQ_MIN}.gz | ${JS_ENGINE} ${BUILD_DIR}/sizer.js; \
237- rm ${JQ_MIN}.gz; \
238- else \
239- echo "You must have NodeJS installed in order to size jQuery."; \
240- fi
241-
242-freq: jquery min
243- @@if test ! -z ${JS_ENGINE}; then \
244- ${JS_ENGINE} ${BUILD_DIR}/freq.js; \
245- else \
246- echo "You must have NodeJS installed to report the character frequency of minified jQuery."; \
247- fi
248-
249-min: jquery ${JQ_MIN}
250-
251-${JQ_MIN}: ${JQ}
252- @@if test ! -z ${JS_ENGINE}; then \
253- echo "Minifying jQuery" ${JQ_MIN}; \
254- ${COMPILER} ${JQ} > ${JQ_MIN}.tmp; \
255- ${POST_COMPILER} ${JQ_MIN}.tmp; \
256- rm -f ${JQ_MIN}.tmp; \
257- else \
258- echo "You must have NodeJS installed in order to minify jQuery."; \
259- fi
260-
261-clean:
262- @@echo "Removing Distribution directory:" ${DIST_DIR}
263- @@rm -rf ${DIST_DIR}
264-
265- @@echo "Removing built copy of Sizzle"
266- @@rm -f src/selector.js
267-
268-distclean: clean
269- @@echo "Removing submodules"
270- @@rm -rf test/qunit src/sizzle
271-
272-# change pointers for submodules and update them to what is specified in jQuery
273-# --merge doesn't work when doing an initial clone, thus test if we have non-existing
274-# submodules, then do an real update
275-update_submodules:
276- @@if [ -d .git ]; then \
277- if git submodule status | grep -q -E '^-'; then \
278- git submodule update --init --recursive; \
279- else \
280- git submodule update --init --recursive --merge; \
281- fi; \
282- fi;
283-
284-# update the submodules to the latest at the most logical branch
285-pull_submodules:
286- @@git submodule foreach "git pull \$$(git config remote.origin.url)"
287- @@git submodule summary
288-
289-pull: pull_submodules
290- @@git pull ${REMOTE} ${BRANCH}
291-
292-.PHONY: all jquery hint min clean distclean update_submodules pull_submodules pull core
293
294=== modified file 'Makefile'
295--- Makefile 2012-08-04 08:26:20 +0000
296+++ Makefile 2013-12-18 23:39:36 +0000
297@@ -5,8 +5,8 @@
298 PREFIX = .
299 DIST_DIR = ${PREFIX}/dist
300
301-JS_ENGINE ?= `which node 2>/dev/null || which nodejs 2>/dev/null`
302-COMPILER = `which uglifyjs 2>/dev/null` --unsafe
303+JS_ENGINE ?= `which node nodejs 2>/dev/null`
304+COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe
305 POST_COMPILER = ${JS_ENGINE} ${BUILD_DIR}/post-compile.js
306
307 BASE_FILES = ${SRC_DIR}/core.js\
308@@ -42,11 +42,11 @@
309 JQ_VER = $(shell cat version.txt)
310 VER = sed "s/@VERSION/${JQ_VER}/"
311
312-DATE=$(shell date)
313+DATE=$(shell git log -1 --pretty=format:%ad)
314
315 all: update_submodules core
316
317-core: jquery
318+core: jquery min hint size
319 @@echo "jQuery build complete."
320
321 ${DIST_DIR}:
322
323=== modified file 'debian/changelog'
324--- debian/changelog 2013-07-02 13:24:53 +0000
325+++ debian/changelog 2013-12-18 23:39:36 +0000
326@@ -1,3 +1,21 @@
327+jquery (1.7.2+dfsg-3ubuntu1) trusty; urgency=medium
328+
329+ * Merge from debian. Remaining change:
330+ - debian/control: Suggest rather than recommend javascript-common;
331+ it's in universe and we don't necessarily need to publish these
332+ scripts via http
333+
334+ -- Jackson Doak <noskcaj@ubuntu.com> Thu, 19 Dec 2013 10:14:41 +1100
335+
336+jquery (1.7.2+dfsg-3) unstable; urgency=low
337+
338+ * Generating jquery minified from source again (Closes: #495178)
339+ * Added lintian override:
340+ jquery source: license-problem-json-evil debian/README.Debian
341+ * Updated Standards-Version to 3.9.4 (no changes)
342+
343+ -- Marcelo Jorge Vieira (metal) <metal@debian.org> Thu, 01 Aug 2013 21:27:33 -0300
344+
345 jquery (1.7.2+dfsg-2ubuntu1) saucy; urgency=low
346
347 * Sync with Debian (LP: #1197055). Remaining change:
348
349=== modified file 'debian/control'
350--- debian/control 2013-07-02 13:24:53 +0000
351+++ debian/control 2013-12-18 23:39:36 +0000
352@@ -4,8 +4,8 @@
353 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
354 XSBC-Original-Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org>
355 Uploaders: Marcelo Jorge Vieira (metal) <metal@debian.org>, Steve Kemp <skx@debian.org>
356-Build-Depends: debhelper (>= 7.0.50~)
357-Standards-Version: 3.9.3
358+Build-Depends: debhelper (>= 7.0.50~), node-uglify
359+Standards-Version: 3.9.4
360 Homepage: http://jquery.com/
361 Vcs-Browser: http://git.debian.org/?p=pkg-javascript/jquery.git
362 Vcs-Git: git://git.debian.org/git/pkg-javascript/jquery.git
363
364=== modified file 'debian/links'
365--- debian/links 2012-08-04 08:26:20 +0000
366+++ debian/links 2013-12-18 23:39:36 +0000
367@@ -1,3 +1,2 @@
368 /usr/share/javascript/jquery/jquery.min.js /usr/share/javascript/jquery/jquery.pack.js
369 /usr/share/javascript/jquery/jquery.min.js /usr/share/javascript/jquery/jquery.lite.js
370-/usr/share/javascript/jquery/jquery.js /usr/share/javascript/jquery/jquery.min.js
371
372=== modified file 'debian/patches/build.patch'
373--- debian/patches/build.patch 2012-05-22 21:26:51 +0000
374+++ debian/patches/build.patch 2013-12-18 23:39:36 +0000
375@@ -1,5 +1,7 @@
376+Index: jquery/Makefile
377+===================================================================
378 --- jquery.orig/Makefile 2012-05-22 11:55:47.000000000 -0300
379-+++ jquery/Makefile 2012-05-22 22:04:41.000000000 -0300
380++++ jquery/Makefile 2013-08-01 21:44:10.674826432 -0300
381 @@ -5,8 +5,8 @@
382 PREFIX = .
383 DIST_DIR = ${PREFIX}/dist
384@@ -11,7 +13,7 @@
385 POST_COMPILER = ${JS_ENGINE} ${BUILD_DIR}/post-compile.js
386
387 BASE_FILES = ${SRC_DIR}/core.js\
388-@@ -42,7 +42,7 @@
389+@@ -42,11 +42,11 @@
390 JQ_VER = $(shell cat version.txt)
391 VER = sed "s/@VERSION/${JQ_VER}/"
392
393@@ -20,3 +22,8 @@
394
395 all: update_submodules core
396
397+-core: jquery min hint size
398++core: jquery min size
399+ @@echo "jQuery build complete."
400+
401+ ${DIST_DIR}:
402
403=== removed file 'debian/patches/no-min.diff'
404--- debian/patches/no-min.diff 2012-08-04 08:26:20 +0000
405+++ debian/patches/no-min.diff 1970-01-01 00:00:00 +0000
406@@ -1,11 +0,0 @@
407---- jquery-1.7.2+debian.orig/Makefile
408-+++ jquery-1.7.2+debian/Makefile
409-@@ -46,7 +46,7 @@ DATE=$(shell date)
410-
411- all: update_submodules core
412-
413--core: jquery min hint size
414-+core: jquery
415- @@echo "jQuery build complete."
416-
417- ${DIST_DIR}:
418
419=== modified file 'debian/patches/series'
420--- debian/patches/series 2012-08-04 08:26:20 +0000
421+++ debian/patches/series 2013-12-18 23:39:36 +0000
422@@ -1,2 +1,1 @@
423 build.patch
424-no-min.diff
425
426=== modified file 'debian/rules'
427--- debian/rules 2012-08-04 08:26:20 +0000
428+++ debian/rules 2013-12-18 23:39:36 +0000
429@@ -8,6 +8,7 @@
430
431 override_dh_clean:
432 rm -rf dist/
433+ rm build/.sizecache.json
434 dh_clean
435
436 .PHONY: build
437
438=== added file 'debian/source.lintian-overrides'
439--- debian/source.lintian-overrides 1970-01-01 00:00:00 +0000
440+++ debian/source.lintian-overrides 2013-12-18 23:39:36 +0000
441@@ -0,0 +1,1 @@
442+jquery source: license-problem-json-evil debian/README.Debian

Subscribers

People subscribed via source and target branches

to all changes: