[Pkg-javascript-commits] [uglifyjs] 01/01: Fix help (Closes: #847642)

[Bastien Roucariès]

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

rouca pushed a commit to branch master
in repository uglifyjs.

commit bdee2ad779dc636c8a7e15dc43dd7b8574d7185d
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Thu Aug 17 23:52:09 2017 +0200

    Fix help (Closes: #847642)
---
 debian/changelog                       |  8 ++++++++
 debian/patches/2100_NMU_fix_help.patch | 13 +++++++++++++
 debian/patches/series                  |  1 +
 debian/rules                           |  5 ++++-
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index eae7e65..fc14cef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+uglifyjs (2.8.22-2) experimental; urgency=medium
+
+  * Team upload
+  * Bug fix: "neither manpage nor --help output useful", thanks to Ben
+    Finney (Closes: #847642).
+
+ -- Bastien Roucariès <rouca at debian.org>  Thu, 17 Aug 2017 23:51:32 +0200
+
 uglifyjs (2.8.22-1) experimental; urgency=medium
 
   [ upstream ]
diff --git a/debian/patches/2100_NMU_fix_help.patch b/debian/patches/2100_NMU_fix_help.patch
new file mode 100644
index 0000000..f866bf8
--- /dev/null
+++ b/debian/patches/2100_NMU_fix_help.patch
@@ -0,0 +1,13 @@
+Index: uglifyjs/bin/uglifyjs
+===================================================================
+--- uglifyjs.orig/bin/uglifyjs
++++ uglifyjs/bin/uglifyjs
+@@ -161,7 +161,7 @@ if (ARGS.ast_help) {
+ }
+ 
+ if (ARGS.h || ARGS.help) {
+-    print(yargs.help());
++    print(yargs.help().argv);
+     process.exit(0);
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5140308..9e32155 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 1001_break_dep_loop.patch
 1002_avoid_timeout_in_tests.patch
 2002_node_conflict.patch
+2100_NMU_fix_help.patch
diff --git a/debian/rules b/debian/rules
index 669091a..83cffcc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,10 @@ CDBS_BUILD_DEPENDS +=, help2man
 DEB_INSTALL_MANPAGES_$(pkg) = debian/uglifyjs.1
 common-build-indep:: debian/stamp-build
 debian/stamp-build:
-	NODE_PATH=lib help2man --no-info bin/uglifyjs > debian/uglifyjs.1
+	NODE_PATH=lib help2man --no-info bin/uglifyjs | sed \
+	    -e 's/[[:space:]]*\[string\]$$/ This parameter is a string./g' \
+	    -e 's/[[:space:]]*\[boolean\]$$/ This parameter is a boolean./g' \
+	    -e 's/[[:space:]]*\[array\]$$/ This parameter is an array./g'> debian/uglifyjs.1
 	$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),\
 		,\
 		NODE_PATH=lib nodejs test/run-tests.js \

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