[Pkg-javascript-commits] [node-expat] 274/371: Tidy package relations handling.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository node-expat.

commit 8ea2e33b02d908711e77d42435bf725bb2660090
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Sep 8 19:29:31 2014 +0200

    Tidy package relations handling.
---
 debian/control.in |  6 +++---
 debian/rules      | 25 ++++++++++++++++---------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index b91fd95..4c9860f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -11,9 +11,9 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/node-expat.git
 
 Package: node-node-expat
 Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends},
- nodejs
+Depends: ${cdbs:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
 Conflicts: libnode-node-expat
 Replaces: libnode-node-expat
 Provides: libnode-node-expat
diff --git a/debian/rules b/debian/rules
index 665144f..a11ce1a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,35 +21,42 @@ include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/langcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-libpkgname = node-node-expat
+pkg = node-node-expat
 
 # suppress bogus build-dependency (triggered by convenience code copy)
 CDBS_BUILD_DEPENDS_rules_buildcore_config-guess-sub =
 
-CDBS_BUILD_DEPENDS += , nodejs-dev, libexpat-dev, node-vows
+# Needed by upstream build process and at runtime
+deps = nodejs
+
+# Needed by upstream build process
+bdeps = nodejs-dev, libexpat-dev, node-vows
+
+CDBS_BUILD_DEPENDS +=, $(bdeps), $(deps)
+CDBS_DEPENDS_$(pkg) = $(deps)
 
 DEB_UPSTREAM_URL = https://github.com/node-xmpp/$(DEB_UPSTREAM_PACKAGE)/archive
 DEB_UPSTREAM_TARBALL_BASENAME = v$(DEB_UPSTREAM_TARBALL_VERSION)
 
-DEB_INSTALL_DOCS_$(libpkgname) += README.markdown
+DEB_INSTALL_DOCS_$(pkg) += README.markdown
 
 # Fix backwards compatibility. See bug#678762
-DEB_DH_LINK_$(libpkgname) = usr/lib/nodejs/node_expat.node /usr/lib/nodejs/node-expat.node
+DEB_DH_LINK_$(pkg) = usr/lib/nodejs/node_expat.node /usr/lib/nodejs/node-expat.node
 
 # node-waf build routines
 NODE-WAF-BUILDFLAGS = CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LINKFLAGS="$(LDFLAGS)"
 NODE-WAF = NOCOLOR=1 NODE_PATH=$(cdbs_curdestdir)usr/lib/nodejs node-waf -v
 NODE = NODE_DISABLE_COLORS=1 node
-configure/$(libpkgname):: debian/stamp-node-waf-configure
+configure/$(pkg):: debian/stamp-node-waf-configure
 debian/stamp-node-waf-configure:
 	$(NODE-WAF-BUILDFLAGS) $(NODE-WAF) configure
 	touch $@
-build/$(libpkgname):: debian/stamp-node-waf-build
+build/$(pkg):: debian/stamp-node-waf-build
 debian/stamp-node-waf-build:
 	$(NODE-WAF) build
 	$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,$(NODE) test.js)
 	touch $@
-install/$(libpkgname)::
+install/$(pkg)::
 	$(NODE-WAF) install
 clean::
 	rm -rf build
@@ -58,7 +65,7 @@ clean::
 
 # Node modules have an uncommon extension preventing autodetection by
 # dh_shlibdeps, so we do it manually
-binary-strip-IMPL/$(libpkgname)::
+binary-strip-IMPL/$(pkg)::
 	$(if $(is_debug_package)$(filter nostrip,$(DEB_BUILD_OPTIONS)),,find "$(cdbs_curdestdir)" -name "*.node" -exec strip --remove-section=.comment --remove-section=.note --strip-unneeded {} +)
-binary-predeb-IMPL/$(libpkgname)::
+binary-predeb-IMPL/$(pkg)::
 	find "$(cdbs_curdestdir)" -name "*.node" -exec dpkg-shlibdeps -Tdebian/$(cdbs_curpkg).substvars {} +

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