[maven-scm] 02/02: Fixed the build failure when generating the javadoc (Closes: #794897)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Aug 31 21:09:28 UTC 2015


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

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

commit fdad7a48ec69ac94c222ddbf1692428928f4ca61
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Aug 31 23:03:22 2015 +0200

    Fixed the build failure when generating the javadoc (Closes: #794897)
---
 debian/changelog | 7 +++++++
 debian/control   | 1 +
 debian/rules     | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f0a8e82..9bc3848 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-scm (1.3-7) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure when generating the javadoc (Closes: #794897)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 31 Aug 2015 23:02:13 +0200
+
 maven-scm (1.3-6) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index f07b428..de20200 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: default-jdk-doc,
                      junit (>= 3.8.2),
                      libganymed-ssh2-java,
+                     libmaven-install-plugin-java,
                      libmaven-javadoc-plugin-java,
                      libmodello-maven-plugin-java,
                      libnetbeans-cvsclient-java,
diff --git a/debian/rules b/debian/rules
index 562f1f3..8f6ebb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
+DEB_MAVEN_DOC_TARGET := install javadoc:jar javadoc:aggregate -DskipTests
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

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



More information about the pkg-java-commits mailing list