[Pkg-javascript-commits] [leaflet] 32/40: Use recent Uglifyjs: Drop patch 2002. Tighten to build-depend versioned on node-uglify.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository leaflet.

commit a25fd24266eaa80821a555c7dc2f13b6b10704da
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Oct 16 17:20:07 2014 +0200

    Use recent Uglifyjs: Drop patch 2002. Tighten to build-depend versioned on node-uglify.
---
 debian/patches/2002_use_old_uglifyjs.patch | 37 ------------------------------
 debian/patches/series                      |  1 -
 debian/rules                               |  2 +-
 3 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/debian/patches/2002_use_old_uglifyjs.patch b/debian/patches/2002_use_old_uglifyjs.patch
deleted file mode 100644
index 578396c..0000000
--- a/debian/patches/2002_use_old_uglifyjs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Revive pre-0.5 use of Uglifyjs 1.x.
-Author: Jonas Smedegaard <dr at jones.dk>
-Forwarded: not-needed
-Last-Update: 2013-01-19
-
---- a/build/build.js
-+++ b/build/build.js
-@@ -45,6 +45,17 @@
- 
- exports.getFiles = getFiles;
- 
-+function uglify(code) {
-+	var pro = UglifyJS.uglify;
-+
-+	var ast = UglifyJS.parser.parse(code);
-+	ast = pro.ast_mangle(ast, {mangle: true});
-+	ast = pro.ast_squeeze(ast);
-+	ast = pro.ast_squeeze_more(ast);
-+
-+	return pro.gen_code(ast) + ';';
-+};
-+
- function getSizeDelta(newContent, oldContent, fixCRLF) {
- 	if (!oldContent) {
- 		return ' (new)';
-@@ -107,10 +118,7 @@
- 
- 	var path = pathPart + '.js',
- 	    oldCompressed = loadSilently(path),
--	    newCompressed = copy + UglifyJS.minify(newSrc, {
--	        warnings: true,
--	        fromString: true
--	    }).code,
-+	    newCompressed = copy + uglify(newSrc),
- 	    delta = getSizeDelta(newCompressed, oldCompressed);
- 
- 	console.log('\tCompressed: ' + bytesToKB(newCompressed.length) + delta);
diff --git a/debian/patches/series b/debian/patches/series
index fa8edf4..cb10c03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 2001-dont_test_during_build.patch
-2002_use_old_uglifyjs.patch
diff --git a/debian/rules b/debian/rules
index b4be8f6..b24e611 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 libname = leaflet
 pkg = libjs-leaflet
 
-CDBS_BUILD_DEPENDS += , node-uglify , node-jake
+CDBS_BUILD_DEPENDS +=, node-uglify (>= 2), node-jake
 
 DEB_UPSTREAM_URL = https://github.com/Leaflet/Leaflet/archive
 DEB_UPSTREAM_TARBALL_BASENAME = v$(DEB_UPSTREAM_TARBALL_VERSION)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/leaflet.git