[Pkg-javascript-commits] [node-coveralls] 316/332: Allow configuration of toolname

[Bastien Roucariès]

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

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

commit 31b5fbc2e53a70e5ae83bbdc7d4efdf6beb88081
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Sep 8 10:45:35 2017 +0200

    Allow configuration of toolname
---
 .../{coveralls.js.1.xml.in => @TOOLNAME at .1.xml.in} | 10 ++++-----
 debian/README.Debian                               |  2 +-
 debian/links                                       |  1 -
 debian/links.in                                    |  1 +
 debian/manpages                                    |  1 -
 debian/manpages.in                                 |  1 +
 debian/rules                                       | 26 +++++++++++++++++-----
 debian/tests/control                               |  7 ++++++
 8 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/debian/coveralls.js.1.xml.in b/debian/@TOOLNAME at .1.xml.in
similarity index 82%
rename from debian/coveralls.js.1.xml.in
rename to debian/@TOOLNAME at .1.xml.in
index bbf1893..5018722 100644
--- a/debian/coveralls.js.1.xml.in
+++ b/debian/@TOOLNAME at .1.xml.in
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<refentry id='coveralls.js1'>
+<refentry id='@TOOLNAME at 1'>
   <refmeta>
-    <refentrytitle>coveralls.js</refentrytitle>
+    <refentrytitle>@TOOLNAME@</refentrytitle>
     <manvolnum>1</manvolnum>
     <refmiscinfo class='source'>August 2017</refmiscinfo>
-    <refmiscinfo class='manual'>coveralls.js @VERSION@</refmiscinfo>
+    <refmiscinfo class='manual'>@TOOLNAME@ @VERSION@</refmiscinfo>
   </refmeta>
   <refnamediv>
-    <refname>coveralls.js</refname>
+    <refname>@TOOLNAME@</refname>
     <refpurpose>report coverage to coveralls.io service</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>coveralls.js</command>
+      <command>@TOOLNAME@</command>
     </cmdsynopsis>
   </refsynopsisdiv>
 
diff --git a/debian/README.Debian b/debian/README.Debian
index 5e07fa4..2663fcd 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,4 +1,4 @@
-Notice that the main tools is called coveralls.js in order to avoid
+Notice that the main tools is called node-coveralls in order to avoid
 a conflict with ruby-coveralls package.
 
  -- Bastien Roucariès <rouca at debian.org>, Thu,  7 Sep 2017 22:38:20 +0200
diff --git a/debian/links b/debian/links
deleted file mode 100644
index 8f9f3f0..0000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/nodejs/coveralls/bin/coveralls.js usr/bin/coveralls.js
diff --git a/debian/links.in b/debian/links.in
new file mode 100644
index 0000000..c2fb0af
--- /dev/null
+++ b/debian/links.in
@@ -0,0 +1 @@
+usr/lib/nodejs/coveralls/bin/coveralls.js usr/bin/@TOOLNAME@
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index aa05273..0000000
--- a/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/coveralls.js.1
diff --git a/debian/manpages.in b/debian/manpages.in
new file mode 100644
index 0000000..1a60683
--- /dev/null
+++ b/debian/manpages.in
@@ -0,0 +1 @@
+debian/@TOOLNAME at .1
diff --git a/debian/rules b/debian/rules
index 93ac998..eb6939a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,15 +2,28 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 include /usr/share/dpkg/pkg-info.mk
 
 %:
 	dh $@
 
+TOOLNAME=node-coveralls
+
+do_subst = sed -e 's/[@]VERSION[@]/$(DEB_VERSION_UPSTREAM)/g' \
+               -e 's/[@]TOOLNAME[@]/$(TOOLNAME)/g'
+
+debian/links: debian/links.in
+	$(do_subst) $< > $@
+debian/manpages: debian/manpages.in
+	$(do_subst) $< > $@
+
+override_dh_auto_configure: debian/links debian/manpages
+	cp -f "debian/@TOOLNAME at .1.xml.in" "debian/$(TOOLNAME).1.xml.in"
+
 # do not use upstream makefile
-override_dh_auto_build:
+override_dh_auto_build: 
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
@@ -26,13 +39,13 @@ override_dh_fixperms:
 	chmod a+x debian/node-coveralls/usr/lib/nodejs/coveralls/bin/coveralls.js
 
 %.1.xml : %.1.xml.in
-	sed -e "s/@VERSION@/$(DEB_VERSION_UPSTREAM)/g" $< > $@
+	$(do_subst) $< > $@
 %.1: %.1.xml
 	cd $(dir $<) &&  docbook2x-man --encoding=utf-8 $(notdir $<)
 
 ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
-override_dh_installman: debian/coveralls.js.1
-	dh_installman --language=C
+override_dh_installman: debian/$(TOOLNAME).1
+	dh_installman
 else
 override_dh_installman:
 endif
@@ -42,4 +55,7 @@ override_dh_installman_clean:
 	rm -rf debian/*.1
 
 override_dh_clean: override_dh_installman_clean
+	rm -f debian/links
+	rm -f debian/manpages
+	rm -f "$(TOOLNAME).1.xml.in"
 	dh_clean
\ No newline at end of file
diff --git a/debian/tests/control b/debian/tests/control
index 3cad515..bfd1365 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,9 @@
 Tests: require
 Depends: node-coveralls
+
+Tests: runtestsuite
+Depends: node-coveralls
+ , node-should (>= 8.0)
+ , node-sinon (>= 1.17)
+ , mocha (>= 1.20)
+

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