[maven-stapler-plugin] 01/07: Removed the -java-doc package (useless and fails to build with Java 8)

[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-stapler-plugin.

commit 7bc46f00c860a3f2e8fad3bcc9ec0d59b590cce7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 8 12:53:31 2015 +0200

    Removed the -java-doc package (useless and fails to build with Java 8)
---
 debian/changelog                                     |  7 +++++++
 debian/control                                       | 14 --------------
 debian/libmaven-stapler-plugin-java-doc.doc-base.api | 10 ----------
 debian/libmaven-stapler-plugin-java-doc.install      |  2 --
 debian/rules                                         |  6 ------
 5 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 38774ac..01358c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-stapler-plugin (1.17-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Removed the -java-doc package (useless and fails to build with Java 8)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 08 Sep 2015 12:49:06 +0200
+
 maven-stapler-plugin (1.17-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index cf87d49..102298c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends-Indep: default-jdk-doc,
                      libdom4j-java,
                      libjaxen-java,
                      libjellydoc-java,
-                     libmaven-javadoc-plugin-java,
                      libmaven-plugin-tools-java,
                      libmaven2-core-java,
                      libmaven2-core-java-doc,
@@ -36,19 +35,6 @@ Depends: libdom4j-java,
          ${maven:Depends},
          ${misc:Depends}
 Recommends: ${maven:OptionalDepends}
-Suggests: libmaven-stapler-plugin-java-doc
 Description: Maven plugin for developing stapler applications
  Maven2 plugin for developing web applications using the
  Stapler HTTP request engine.
-
-Package: libmaven-stapler-plugin-java-doc
-Architecture: all
-Section: doc
-Depends: ${maven:DocDepends}, ${misc:Depends}
-Recommends: ${maven:DocOptionalDepends}
-Suggests: libmaven-stapler-plugin-java
-Description: Documentation for libmaven-stapler-plugin-java-doc
- Maven2 plugin for developing web applications using the
- Stapler HTTP request engine.
- .
- This package provides the API documentation for libmaven-stapler-plugin-java.
diff --git a/debian/libmaven-stapler-plugin-java-doc.doc-base.api b/debian/libmaven-stapler-plugin-java-doc.doc-base.api
deleted file mode 100644
index 227cd19..0000000
--- a/debian/libmaven-stapler-plugin-java-doc.doc-base.api
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: libmaven-stapler-plugin-java
-Title: API Javadoc for Maven Stapler plugin
-Author: Maven Stapler plugin developers
-Abstract: This is the API Javadoc provided for the
- libmaven-stapler-plugin-java library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libmaven-stapler-plugin-java/api/index.html
-Files: /usr/share/doc/libmaven-stapler-plugin-java/api/*
diff --git a/debian/libmaven-stapler-plugin-java-doc.install b/debian/libmaven-stapler-plugin-java-doc.install
deleted file mode 100644
index b2c5166..0000000
--- a/debian/libmaven-stapler-plugin-java-doc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-
-target/apidocs/* usr/share/doc/libmaven-stapler-plugin-java/api
diff --git a/debian/rules b/debian/rules
index 9b2fc79..b76c54a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,5 @@ include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 
-# Hack to work around a Javadoc error with Java 8u20
-JAVA_VERSION = $(shell $(JAVA_HOME)/bin/java -version 2>&1 | sed 's/.*version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q')
-ifeq ($(shell [ $(JAVA_VERSION) -ge 18 ] && echo true),true)
-DEB_MAVEN_ARGS = '-DadditionalJOption=-cp .'
-endif
-
 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-stapler-plugin.git