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 cafc9403b0da58c789ed95e5d8ff3b165bcde76f
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Aug 11 23:35:44 2017 +0200
Honor the "nodoc" build option and skip the javadoc generation
---
debian/changelog | 1 +
share/perl/maven.pm | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 40f4b0a..e68ffc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
maven-debian-helper (2.2.3) UNRELEASED; urgency=medium
* Team upload.
+ * Honor the "nodoc" build option and skip the javadoc generation
* Added the project.build.sourceEncoding property in the documentation
header of the generated maven.properties file
diff --git a/share/perl/maven.pm b/share/perl/maven.pm
index 6d1c1f2..36b2d4c 100644
--- a/share/perl/maven.pm
+++ b/share/perl/maven.pm
@@ -7,7 +7,7 @@ package Debian::Debhelper::Buildsystem::maven;
use strict;
use base 'Debian::Debhelper::Buildsystem';
-use Debian::Debhelper::Dh_Lib qw(%dh doit);
+use Debian::Debhelper::Dh_Lib qw(%dh doit get_buildoption);
sub DESCRIPTION {
"Maven (pom.xml)"
@@ -25,7 +25,7 @@ sub new {
my @packages = @{$dh{DOPACKAGES}};
$this->{package} = shift @packages;
- $this->{doc_package} = (grep /-doc$/, @packages)[0];
+ $this->{doc_package} = (grep /-doc$/, @packages)[0] &&
(get_buildoption("nodoc") != 1);
my $classconf = '/etc/maven/m2-debian.conf';
my @classpath = ('/usr/share/maven/boot/plexus-classworlds-2.x.jar');
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/maven-debian-helper.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
