[Pkg-javascript-commits] [backbone] 06/14: Build-depend unconditionally on node-uglify (drop fallback-build-dependency on yui-compressor).

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository backbone.

commit 5f53e57e5f564c48349a43c87c1f9dfe0c7ac9e2
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Aug 30 21:07:50 2016 +0200

    Build-depend unconditionally on node-uglify (drop fallback-build-dependency on yui-compressor).
---
 debian/rules | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0fda4a6..36f328a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,14 +24,10 @@ pkg-js = libjs-$(lib)
 js-stems = $(lib)
 pkg-node = node-$(lib)
 
-# Ease backporting (node-uglify is tough to backport)
-# TODO: drop fallback-dependency when uglifyjs is in Debian stable
-CDBS_BUILD_DEPENDS += , node-uglify | yui-compressor
-js-compressor := $(or $(notdir $(shell which uglifyjs)),yui-compressor)
-
 # Minimal requirement according to upstream index.html
 underscore_minver = 1.7.0~dfsg
 
+CDBS_BUILD_DEPENDS +=, node-uglify
 CDBS_BUILD_DEPENDS +=, coffeescript, libjs-json, libjs-jquery, libjs-qunit
 CDBS_BUILD_DEPENDS +=, libjs-underscore (>= $(underscore_minver))
 CDBS_BUILD_DEPENDS +=, node-underscore (>= $(underscore_minver))
@@ -71,15 +67,13 @@ js-dirname ?= $(lib)
 js-stems ?= $(basename $(wildcard $(js-basedir)*.js))
 js-min ?= $(js-stems:$(js-basedir)%=debian/%.min.js)
 js-destdir ?= /usr/share/javascript/$(js-dirname)
-js-compressor ?= uglifyjs
-js-compressor-opts ?= -o $@ $<
 
 DEB_DH_INSTALL_ARGS_$(pkg-node) = package.json $(node-destdir)
 DEB_DH_INSTALL_ARGS_$(pkg-js) = $(addsuffix .js,$(js-stems)) debian/*.min.js $(js-destdir)
 
 build/$(pkg-js):: $(js-min)
 $(js-min): debian/%.min.js: $(js-basedir)%.js
-	$(js-compressor) $(js-compressor-opts)
+	uglifyjs -o $@ $<
 clean::
 	rm -f debian/*.js
 

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