diff -Nru sockjs-client-0.3.4+dfsg/debian/changelog sockjs-client-0.3.4+dfsg/debian/changelog --- sockjs-client-0.3.4+dfsg/debian/changelog 2014-02-28 09:38:31.000000000 +0000 +++ sockjs-client-0.3.4+dfsg/debian/changelog 2015-12-08 02:20:43.000000000 +0000 @@ -1,3 +1,15 @@ +sockjs-client (0.3.4+dfsg-2) unstable; urgency=low + + [ Mattia Rizzolo ] + * Team Upload. + * debian/watch: import watch file from sepwatch. Thanks bartm! + * debian/control: bump Standards-Version to 3.9.6. + + [ Tonnerre LOMBARD ] + * Modify build coffeescript to work with uglifyjs 2.0. Closes: #750719 + + -- Mattia Rizzolo Tue, 08 Dec 2015 02:17:07 +0000 + sockjs-client (0.3.4+dfsg-1) unstable; urgency=low * Initial release. Closes: #733821 diff -Nru sockjs-client-0.3.4+dfsg/debian/control sockjs-client-0.3.4+dfsg/debian/control --- sockjs-client-0.3.4+dfsg/debian/control 2014-02-28 09:38:31.000000000 +0000 +++ sockjs-client-0.3.4+dfsg/debian/control 2015-12-08 02:20:43.000000000 +0000 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Tonnerre LOMBARD Build-Depends: coffeescript, debhelper (>= 9), node-optimist, node-static, - node-uglify, nodejs, libjs-json -Standards-Version: 3.9.5 + node-uglify (>= 2.0), nodejs, libjs-json +Standards-Version: 3.9.6 Homepage: https://github.com/sockjs/sockjs-client Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-javascript/sockjs-client.git Vcs-Git: git://anonscm.debian.org/pkg-javascript/sockjs-client.git diff -Nru sockjs-client-0.3.4+dfsg/debian/copyright sockjs-client-0.3.4+dfsg/debian/copyright --- sockjs-client-0.3.4+dfsg/debian/copyright 2014-03-02 16:06:31.000000000 +0000 +++ sockjs-client-0.3.4+dfsg/debian/copyright 2015-12-08 01:50:48.000000000 +0000 @@ -7,28 +7,27 @@ License: Expat Files: lib/trans-jsonp-receiver.js -Copyright: 2011-2012 VMware, Inc. +Copyright: 2010 Guillermo Rauch , + Julian Aubourg , LearnBoost , + VMware, Inc. License: Expat Comment: - Part of the source code has been derived from socket.io (see: - https://github.com/LearnBoost/socket.io/tree/0.6.17#readme) and jQuery-JSONP - (see: - https://code.google.com/p/jquery-jsonp/source/browse/trunk/core/jquery.jsonp.js) + Part of the source code has been copied and pasted from the + LearnBoost socket.io documentation, see + https://github.com/LearnBoost/socket.io/tree/0.6.17#readme Files: lib/info.js lib/utils.js -Copyright: 2011-2012 VMware, Inc. -License: Expat -Comment: +Copyright: Douglas Crockford , VMware, Inc. +License: public-domain, Expat Parts of these files were derived from JSON-js by Douglas Crockford, which - is available in the Public Domain. + is available in the Public Domain. The rest of the files is available under + the Expat style MIT license. -Files: lib/trans-jsonp-polling.js -Copyright: 2011-2012 VMware, Inc. +Files: lib/trans-jsonp-polling.js lib/trans-sender.js + tests/html/example-cursors.html tests/html/smoke-reconnect.html + tests/html/smoke-latency.html +Copyright: Julian Aubourg , VMware, Inc. License: Expat -Comment: - Part of the code has been derived from jQuery-JSONP by Julian Aubourg - (see: - https://code.google.com/p/jquery-jsonp/source/browse/trunk/core/jquery.jsonp.js) Files: tests/html/static/qunit.css Copyright: 2011 John Resig, Jörn Zaefferer diff -Nru sockjs-client-0.3.4+dfsg/debian/patches/series sockjs-client-0.3.4+dfsg/debian/patches/series --- sockjs-client-0.3.4+dfsg/debian/patches/series 2014-02-28 09:38:31.000000000 +0000 +++ sockjs-client-0.3.4+dfsg/debian/patches/series 2015-12-08 01:50:48.000000000 +0000 @@ -1,3 +1,4 @@ fix-coffee-path.patch use-optimist-not-optparse.patch dont-include-sockjs-license.patch +update-uglifyjs.patch diff -Nru sockjs-client-0.3.4+dfsg/debian/patches/update-uglifyjs.patch sockjs-client-0.3.4+dfsg/debian/patches/update-uglifyjs.patch --- sockjs-client-0.3.4+dfsg/debian/patches/update-uglifyjs.patch 1970-01-01 00:00:00.000000000 +0000 +++ sockjs-client-0.3.4+dfsg/debian/patches/update-uglifyjs.patch 2015-12-08 01:50:48.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Require uglifyjs version 2.0. + Version 2 has an entirely different API, so we need to require the new + version in order to be compatible. +Author: Tonnerre LOMBARD +Bug-Debian: http://bugs.debian.org/733821 +Forwarded: not-needed +Last-Update: 2014-06-17 + +--- sockjs-client-0.3.4+dfsg.orig/package.json ++++ sockjs-client-0.3.4+dfsg/package.json +@@ -9,7 +9,7 @@ + "repository": {"type" : "git", + "url" : "https://github.com/sockjs/sockjs-client.git"}, + "devDependencies": { +- "uglify-js" : "1.2.5", ++ "uglify-js" : "2.0.0", + "coffee-script" : "1.2.x", + "optparse" : "1.0.3", + "node-static" : "0.5.9" diff -Nru sockjs-client-0.3.4+dfsg/debian/patches/use-optimist-not-optparse.patch sockjs-client-0.3.4+dfsg/debian/patches/use-optimist-not-optparse.patch --- sockjs-client-0.3.4+dfsg/debian/patches/use-optimist-not-optparse.patch 2014-02-28 09:38:31.000000000 +0000 +++ sockjs-client-0.3.4+dfsg/debian/patches/use-optimist-not-optparse.patch 2015-12-08 01:50:48.000000000 +0000 @@ -2,6 +2,8 @@ Most JavaScript projects use optimist to parse arguments. Using optparse-js for the build scripts here adds an unnecessary dependency on a package most people don't use anyway, so we patch it out. + . + Also, update the uglify code to work with the UglifyJS2 API. Author: Tonnerre LOMBARD Forwarded: https://github.com/sockjs/sockjs-client/pull/148 Last-Update: 2014-01-08 @@ -19,7 +21,25 @@ array_flatten = (arr, acc) -> if typeof acc is 'undefined' -@@ -86,20 +86,34 @@ +@@ -39,10 +39,13 @@ stringify_unicode = (str) -> + + + minify = (data, minify_options)-> +- ast = uglify.parser.parse(data) +- ast = uglify.uglify.ast_mangle(ast, minify_options) +- ast = uglify.uglify.ast_squeeze(ast) +- uglify.uglify.gen_code(ast, minify_options) ++ ast = uglify.parse(data) ++ compressor = uglify.Compressor() ++ ast.figure_out_scope() ++ ast = ast.transform(compressor) ++ ast.compute_char_frequency() ++ ast.mangle_names() ++ ast.print_to_string() + + render = (filename, depth, options) -> + tags = +@@ -86,20 +89,34 @@ main = -> diff -Nru sockjs-client-0.3.4+dfsg/debian/README.Debian sockjs-client-0.3.4+dfsg/debian/README.Debian --- sockjs-client-0.3.4+dfsg/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 +++ sockjs-client-0.3.4+dfsg/debian/README.Debian 2015-12-08 01:50:48.000000000 +0000 @@ -0,0 +1,4 @@ +The original source package of sockjs-client has been repacked and all +minified JavaScript files have been removed. They were shipped without +their source code and they come with Debian already, so the Debian +versions should be used instead. diff -Nru sockjs-client-0.3.4+dfsg/debian/watch sockjs-client-0.3.4+dfsg/debian/watch --- sockjs-client-0.3.4+dfsg/debian/watch 2014-02-28 09:38:31.000000000 +0000 +++ sockjs-client-0.3.4+dfsg/debian/watch 2015-12-08 02:14:28.000000000 +0000 @@ -1,3 +1,4 @@ version=3 -opts=uversionmangle=s/v?(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \ - https://github.com/sockjs/sockjs-client/tags .*/v(\d\S*)\.tar\.gz +opts=dversionmangle=s/\+dfsg\d*$//,uversionmangle=s/-(beta)/~$1/ \ + https://github.com/sockjs/sockjs-client/releases \ + .*[^n]/(?:|v|version-|version|release-|r|REL_|rel-|sockjs-client(?:_|-))(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)