[Pkg-javascript-commits] [node-glob] 01/03: Fix nocheck and nodoc rules

Bastien Roucariès rouca at moszumanska.debian.org
Fri Aug 18 19:00:43 UTC 2017


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

rouca pushed a commit to branch master
in repository node-glob.

commit 7304bac95a8f645cf898273ee7e34ee652e177e7
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Aug 18 20:53:47 2017 +0200

    Fix nocheck and nodoc rules
---
 debian/changelog | 1 +
 debian/control   | 1 +
 debian/rules     | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4882d6a..2e2e033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 node-glob (7.1.2-2) unstable; urgency=medium
 
   * Fix autopkg test suite depends
+  * Fix nocheck and nodoc rules
 
  -- Bastien Roucariès <rouca at debian.org>  Fri, 18 Aug 2017 20:46:20 +0200
 
diff --git a/debian/control b/debian/control
index bc661d8..195cd42 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: David Paleino <dapal at debian.org>, Jérémy Lal <kapouer at melix.org>
 Build-Depends:
  debhelper (>= 9~)
  , dh-buildinfo
+ , dpkg-dev (>= 1.17.14),
  , node-minimatch (>= 3.0.4) <!nocheck>
  , node-inherits (>= 2) <!nocheck>
  , node-once (>= 1.3.0) <!nocheck>
diff --git a/debian/rules b/debian/rules
index 6982de0..3f6c1f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@
 	dh $@
 
 override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
 	tap test/*.js
 else
 	@echo '**********************************************************'
@@ -17,8 +17,14 @@ else
 endif
 
 override_dh_installexamples:
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
 	dh_installexamples
 	# patch example
 	find $(CURDIR)/debian/node-glob/usr/share/doc/node-glob/examples/ -name '*.js' -exec \
                 sed -i 's,require\s*[(]\s*"[.][.][^"]*"\s*[)],require("glob"),g' {} \;
+else
+	@echo '**********************************************************'
+	@echo 'Skip example                                      '
+	@echo '**********************************************************'
+endif
 

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



More information about the Pkg-javascript-commits mailing list