[maven-debian-helper] 04/05: Fix mh_make so that --run-tests=false and --javadoc=false work

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven-debian-helper.

commit 4a71ee81515ce883872331ce6cd7ff3021540751
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Mon Jun 20 10:39:40 2016 +0100

    Fix mh_make so that --run-tests=false and --javadoc=false work
---
 bin/mh_make      | 5 +++++
 debian/changelog | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/bin/mh_make b/bin/mh_make
index 92f4ccd..50596d4 100755
--- a/bin/mh_make
+++ b/bin/mh_make
@@ -114,8 +114,11 @@ if [ -z "$RUN_TESTS" ]; then
     if [ "$RUN" == "n" ]; then
         RUN_TESTS=
     fi
+elif [ "$RUN_TESTS"="false" ]; then
+    RUN_TESTS=
 fi
 
+
 if [ -z "$GEN_JAVADOC" ]; then
 	echo
     echo "Generate the Javadoc while building the package?"
@@ -124,6 +127,8 @@ if [ -z "$GEN_JAVADOC" ]; then
     if [ "$GEN" == "n" ]; then
         GEN_JAVADOC=
     fi
+elif [ "$GEN_JAVADOC"="false" ]; then
+    GEN_JAVADOC=
 fi
 
 echo
diff --git a/debian/changelog b/debian/changelog
index b927109..b882023 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ maven-debian-helper (2.0.7) UNRELEASED; urgency=medium
   * Fix "Using wrong path to mvnDebug when checking if apt-file"
     Updated path for mvnDebug in mh_make (Closes: #726609)
   * DependancySolver displays the relative path to poms (Closes: #826433)
+  * Fix mh_make so that the dependency resolution is properly affected by
+    --run-tests=false and --javadoc=false work (Closes: #827732)
 
   [ Luca Vercelli ]
   * Fixed an error when copy-repo.sh encounters artifacts with ".pom"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git