[maven-debian-helper] 02/08: Fixed the error message in mh_make when licensecheck isn't installed (Closes: #840787)

[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 78b8c8cea322b0bc830c4fd6665cffcf83bec920
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 18 11:03:22 2017 +0200

    Fixed the error message in mh_make when licensecheck isn't installed (Closes: #840787)
---
 bin/mh_make      | 2 +-
 debian/changelog | 4 +++-
 debian/control   | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/mh_make b/bin/mh_make
index cab6495..a895f0c 100755
--- a/bin/mh_make
+++ b/bin/mh_make
@@ -152,7 +152,7 @@ echo
 echo "Checking that licensecheck is installed..."
 if [ ! -x /usr/bin/licensecheck ]; then
     echo "Error: licensecheck is not available." >&2
-    echo "Please install the 'devscripts' package and try again." >&2
+    echo "Please install the 'licensecheck' package and try again." >&2
     exit 1
 else
     echo '[ok]'
diff --git a/debian/changelog b/debian/changelog
index fa8b470..bbcffda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,13 +7,15 @@ maven-debian-helper (2.1.4) UNRELEASED; urgency=medium
     and rules files (Closes: #807686)
 
   [ tony mancill ]
-  * Add licensecheck as dependency of maven-debian-helper (Closes: #840787)
   * Update verbiage in copyright holder prompt to be gender-neutral.
     Thanks to Tom Mable for the bug report. (Closes: #859012)
 
   [ Emmanuel Bourg ]
   * Add the debian.hasPackageVersion property in the installed poms when
     the --has-package-version option is specified (Closes: #862894)
+  * Replaced the suggested dependency on devscripts with licensecheck
+    and fixed the error message in mh_make when licensecheck isn't installed
+    (Closes: #840787)
 
  -- Christopher Hoskin <mans0954 at debian.org>  Sun, 08 Jan 2017 21:32:55 +0000
 
diff --git a/debian/control b/debian/control
index 4d6cfb1..8ecbf08 100644
--- a/debian/control
+++ b/debian/control
@@ -31,10 +31,9 @@ Depends: ${misc:Depends}, default-jdk-headless | default-jdk, maven-repo-helper
          libplexus-velocity-java,
          libsurefire-java,
          libxml2-utils,
-         licensecheck,
          velocity,
          unzip
-Suggests: libmaven-javadoc-plugin-java, apt-file, devscripts, subversion
+Suggests: libmaven-javadoc-plugin-java, apt-file, licensecheck, subversion
 Description: Helper tools for building Debian packages with Maven
  maven-debian-helper is a set of tools used to generate Debian packages from
  Maven projects and build them in a manner that complies with the Debian

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