[Pkg-javascript-commits] [backbone] 33/97: Fix install code for web browsers and symlink for Node (not opposite: not always supported by web servers). Generalize debian/rules internally.

[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 ac232b51d7854c88d0468f01b1f7f4135f115d52
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Dec 24 14:59:38 2011 +0700

    Fix install code for web browsers and symlink for Node (not opposite: not always supported by web servers). Generalize debian/rules internally.
---
 debian/install              |  2 --
 debian/libjs-backbone.links |  1 -
 debian/rules                | 35 ++++++++++++++++++++++++++++-------
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/debian/install b/debian/install
deleted file mode 100644
index 51091a8..0000000
--- a/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-backbone.js		/usr/lib/nodejs
-debian/backbone.min.js	/usr/share/javascript/backbone
diff --git a/debian/libjs-backbone.links b/debian/libjs-backbone.links
deleted file mode 100644
index 5fc0f9d..0000000
--- a/debian/libjs-backbone.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/nodejs/backbone.js usr/share/javascript/backbone/backbone.js
diff --git a/debian/rules b/debian/rules
index 9b34ce8..eb166c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,11 +20,16 @@
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
+libname = backbone
+js-pkgname = libjs-$(libname)
+js-stems = $(libname)
+node-pkgname = libjs-$(libname)
+
 # suppress optional build-dependencies
 CDBS_BUILD_DEPENDS_rules_upstream-tarball =
 CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
 
-DEB_UPSTREAM_URL = http://githubredir.debian.net/github/documentcloud/backbone/
+DEB_UPSTREAM_URL = http://githubredir.debian.net/github/documentcloud/$(libname)
 DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_TARBALL_VERSION)
 DEB_UPSTREAM_WGET_OPTS += --no-check-certificate
 DEB_UPSTREAM_TARBALL_MD5 = 819395a6bca7ab67e5d61e2eb0252e5c
@@ -32,20 +37,36 @@ DEB_UPSTREAM_TARBALL_MD5 = 819395a6bca7ab67e5d61e2eb0252e5c
 # Silence images in addition to the default debian files
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^docs/images/.*\.(jpg|png)|debian/(changelog|copyright(|_hints|_newhints))$
 
-DEB_INSTALL_DOCS_libjs-backbone += index.html
-DEB_INSTALL_EXAMPLES_libjs-backbone += examples/*
+DEB_INSTALL_DOCS_ALL += index.html
+DEB_INSTALL_EXAMPLES_$(js-pkgname) += examples/*
 
 # Ease backporting (libnode-uglify is tough to backport)
 # TODO: drop fallback-dependency after Squeeze
 CDBS_BUILD_DEPENDS += , libnode-uglify | yui-compressor
 js-compressor := $(or $(notdir $(shell which uglifyjs)),yui-compressor)
 
-js-pkgname = libjs-backbone
-js-stems = backbone
-js-min = $(js-stems:%=debian/%.min.js)
+# TODO: generalize parts below as a CDBS javascript snippet
+
+#js-basedir =
+js-dirname ?= $(libname)
+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_$(js-pkgname) = $(addsuffix .js,$(js-stems)) debian/*.min.js $(js-destdir)
 
 build/$(js-pkgname):: $(js-min)
 $(js-min): debian/%.min.js: $(js-basedir)%.js
-	$(js-compressor) -o $@ $<
+	$(js-compressor) $(js-compressor-opts)
 clean::
 	rm -f debian/*.js
+
+# TODO: maybe generalize parts below as a CDBS node snippet
+
+node-dirname ?= $(libname)
+js-nodestem ?= $(libname)
+node-destdir ?= /usr/lib/nodejs/
+
+DEB_DH_LINK_$(node-pkgname) = $(js-destdir)/$(js-nodestem).js $(node-destdir)$(node-dirname).js

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