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 0e37d1e2e35ce351cc67c9f44fc6f22c1d1e841c Author: Emmanuel Bourg <[email protected]> Date: Wed Aug 7 11:52:10 2013 +0200 Don't install the documentation jar by default (Closes: #711852) --- debian/changelog | 6 ++++++ maven-packager-utils/src/main/resources/rules.vm | 2 +- share/cdbs/1/class/maven-vars.mk | 2 +- share/perl/maven.pm | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index cff7deb..f553391 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +maven-debian-helper (1.6.3) UNRELEASED; urgency=low + + * Don't install the documentation jar by default (Closes: #711852) + + -- Emmanuel Bourg <[email protected]> Tue, 30 Jul 2013 15:22:00 +0200 + maven-debian-helper (1.6.2) unstable; urgency=low [ Thomas Koch ] diff --git a/maven-packager-utils/src/main/resources/rules.vm b/maven-packager-utils/src/main/resources/rules.vm index 7165eda..e788235 100644 --- a/maven-packager-utils/src/main/resources/rules.vm +++ b/maven-packager-utils/src/main/resources/rules.vm @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/maven.mk JAVA_HOME := /usr/lib/jvm/default-java #if ($project.Packaging == "pom") -DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate +DEB_MAVEN_DOC_TARGET := javadoc:javadoc javadoc:aggregate #end get-orig-source: diff --git a/share/cdbs/1/class/maven-vars.mk b/share/cdbs/1/class/maven-vars.mk index 596fc05..fcbdb24 100644 --- a/share/cdbs/1/class/maven-vars.mk +++ b/share/cdbs/1/class/maven-vars.mk @@ -106,7 +106,7 @@ DEB_MAVEN_BUILD_TARGET = package DEB_MAVEN_INSTALL_TARGET = org.debian.maven:debian-maven-plugin:$(MAVEN_DEBIAN_VERSION):install DEB_MAVEN_CHECK_TARGET = DEB_MAVEN_CLEAN_TARGET = clean -DEB_MAVEN_DOC_TARGET = javadoc:jar +DEB_MAVEN_DOC_TARGET = javadoc:javadoc DEB_MAVEN_INSTALL_DOC_TARGET = org.debian.maven:debian-maven-plugin:$(MAVEN_DEBIAN_VERSION):install-doc endif diff --git a/share/perl/maven.pm b/share/perl/maven.pm index 00520df..c535d37 100644 --- a/share/perl/maven.pm +++ b/share/perl/maven.pm @@ -70,7 +70,7 @@ sub build { if (!@_) { push(@_, "install"); if ($this->{doc_package}) { - push(@_, "javadoc:jar", "javadoc:aggregate"); + push(@_, "javadoc:javadoc", "javadoc:aggregate"); } } -- 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 [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
