Skip to content
Browse files

dh7 usage cleanup and polishing

  • Loading branch information...
1 parent 91acb2b commit 14e9f958e1448b7015763a92075b4d87328557a3 @daevaorn daevaorn committed Feb 15, 2012
Showing with 10 additions and 26 deletions.
  1. +1 −1 debian-npm-ver/control
  2. +4 −13 debian-npm-ver/rules
  3. +1 −1 debian-npm/control
  4. +4 −11 debian-npm/rules
View
2 debian-npm-ver/control
@@ -2,7 +2,7 @@ Source: #PACKAGE#
Section: misc
Priority: optional
Maintainer: #USERNAME# <#EMAIL#>
-Build-Depends: nodejs, ${buildDepends}, #BUILD_DEPS#
+Build-Depends: nodejs, debhelper (>= 7.0.52), ${buildDepends}, #BUILD_DEPS#
Standards-Version: #POLICY#
Package: #PACKAGE#
View
17 debian-npm-ver/rules
@@ -12,27 +12,18 @@ NODE_PREFIX_VERSIONED=$(ROOT_VERSIONED)/usr
%:
dh $@
-build:
+override_dh_auto_build:
cp debian/dirs.in debian/$(PACKAGE_VERSIONED).dirs
- dh build --before dh_auto_build
npm build
npm install --dev
+
+override_dh_auto_test:
npm test
- dh build --after dh_auto_test
-install:
- dh install --before dh_auto_install
- dh install --after dh_auto_install
- dh install --before install
+override_dh_auto_install:
npm install --global --prefix $(NODE_PREFIX) .
# move module
mv $(NODE_PREFIX)/lib/node_modules/$(NPM_PACKAGE) $(NODE_PREFIX_VERSIONED)/lib/node/$(NPM_PACKAGE)@$(NPM_VERSION)
- # fix removed by `npm install` links
- dh_link
- dh install --after install
-
-binary: install
- dh binary
clean:
-rm -f debian/$(PACKAGE)-*.dirs
View
2 debian-npm/control
@@ -2,7 +2,7 @@ Source: #PACKAGE#
Section: misc
Priority: optional
Maintainer: #USERNAME# <#EMAIL#>
-Build-Depends: nodejs, ${buildDepends}, #BUILD_DEPS#
+Build-Depends: nodejs, debhelper (>= 7.0.52), ${buildDepends}, #BUILD_DEPS#
Standards-Version: #POLICY#
Package: #PACKAGE#
View
15 debian-npm/rules
@@ -5,22 +5,15 @@ NODE_PREFIX=debian/${debianName}/usr
%:
dh $@
-build:
- dh build --before dh_auto_build
+override_dh_auto_build:
npm build
npm install --dev
+
+override_dh_auto_test:
npm test
- dh build --after dh_auto_test
-install:
- dh install --before dh_auto_install
- dh install --after dh_auto_install
- dh install --before install
+override_dh_auto_install:
npm install --global --prefix $(NODE_PREFIX) .
- dh install --after install
-
-binary: install
- dh binary
clean:
${cleanCmd}

0 comments on commit 14e9f95

Please sign in to comment.
Something went wrong with that request. Please try again.