[maven-debian-helper] 01/03: Don't install the documentation jar by default (Closes: #711852)

[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 6e4754d0fb1806bf42507a29bb6ded767a27084f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 29 17:31:33 2015 +0200

    Don't install the documentation jar by default (Closes: #711852)
---
 debian/changelog                 | 6 ++++++
 share/cdbs/1/class/maven-vars.mk | 2 +-
 share/perl/maven.pm              | 3 ---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0572941..901a0ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+maven-debian-helper (1.6.13) UNRELEASED; urgency=medium
+
+  * Don't install the documentation jar by default (Closes: #711852)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 29 Sep 2015 16:59:55 +0200
+
 maven-debian-helper (1.6.12) unstable; urgency=medium
 
   * Set the locale to en_US when generating the javadoc
diff --git a/share/cdbs/1/class/maven-vars.mk b/share/cdbs/1/class/maven-vars.mk
index 596fc05..45d3fb7 100644
--- a/share/cdbs/1/class/maven-vars.mk
+++ b/share/cdbs/1/class/maven-vars.mk
@@ -107,6 +107,6 @@ DEB_MAVEN_INSTALL_TARGET = org.debian.maven:debian-maven-plugin:$(MAVEN_DEBIAN_V
 DEB_MAVEN_CHECK_TARGET =
 DEB_MAVEN_CLEAN_TARGET = clean
 DEB_MAVEN_DOC_TARGET = javadoc:jar
-DEB_MAVEN_INSTALL_DOC_TARGET = org.debian.maven:debian-maven-plugin:$(MAVEN_DEBIAN_VERSION):install-doc
+DEB_MAVEN_INSTALL_DOC_TARGET =
 
 endif
diff --git a/share/perl/maven.pm b/share/perl/maven.pm
index 19d63f1..a0c4771 100644
--- a/share/perl/maven.pm
+++ b/share/perl/maven.pm
@@ -101,9 +101,6 @@ sub install {
 	$this->doit_in_builddir("mh_resolve_dependencies", "--non-interactive",
 		"--offline", "-p$this->{package}", @resolvedep_args);
 	if ($this->{doc_package}) {
-		$this->doit_in_builddir(@{$this->{maven_cmd}},
-			"-Ddebian.package=$this->{doc_package}",
-			"org.debian.maven:debian-maven-plugin:$maven_debian_version:install-doc");
 		doit("cp","debian/$this->{package}.substvars",
 			"debian/$this->{doc_package}.substvars");
 		# clean up generated docs

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