[jasperreports] 05/06: Removed the -java-doc package to avoid the build failure with Java 9 (Closes: #875416)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Dec 4 22:20:59 UTC 2017


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

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

commit d16bc110ff3835b53e8baf3f1d3bdd3e9df52466
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 4 23:13:30 2017 +0100

    Removed the -java-doc package to avoid the build failure with Java 9 (Closes: #875416)
---
 debian/changelog                                 |  2 ++
 debian/control                                   | 14 --------------
 debian/libjasperreports-java-doc.doc-base.api    |  9 ---------
 debian/libjasperreports-java-doc.doc-base.config |  9 ---------
 debian/libjasperreports-java-doc.doc-base.schema |  9 ---------
 debian/libjasperreports-java-doc.install         |  3 ---
 6 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4301e2c..d936e8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 jasperreports (6.2.2-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Removed the -java-doc package to avoid the build failure with Java 9
+    (Closes: #875416)
   * Removed the build dependencies on libaspectj-java, libjoptsimple-java
     and libyaml-snake-java since the FTBFS reported in #844362 was actually
     caused by #844428.
diff --git a/debian/control b/debian/control
index 5f71b3b..37a4a45 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,6 @@ Build-Depends:
  libjexcelapi-java,
  libjfreechart-java,
  liblucene4.10-java (>= 4.10.4+dfsg-2~),
- libmaven-javadoc-plugin-java,
  libmondrian-java (>= 1:3.11.0.1-4~),
  libolap4j-java,
  librhino-java,
@@ -60,16 +59,3 @@ Description: Java reporting generator library
  are used to generate ready to print documents using data from customizable data
  sources, including JDBC. The output can be delivered to the screen,
  printer, or stored in PDF, HTML, XLS, CSV, and XML format.
-
-Package: libjasperreports-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Suggests: libjasperreports-java
-Description: Java reporting generator library - documentation
- JasperReports is a Java reporting generator library. XML report templates
- are used to generate ready to print documents using data from customizable data
- sources, including JDBC. The output can be delivered to the screen,
- printer, or stored in PDF, HTML, XLS, CSV, and XML format.
- .
- This package contains Javadoc API and Schema Reference for JasperReports.
diff --git a/debian/libjasperreports-java-doc.doc-base.api b/debian/libjasperreports-java-doc.doc-base.api
deleted file mode 100644
index 7d0fa7e..0000000
--- a/debian/libjasperreports-java-doc.doc-base.api
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libjasperreports-java-doc
-Title: API Javadoc for JasperReports
-Author: JasperReports developers
-Abstract: This is the API Javadoc provided by the JasperReports library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjasperreports-java/api/index.html
-Files: /usr/share/doc/libjasperreports-java/api/*
diff --git a/debian/libjasperreports-java-doc.doc-base.config b/debian/libjasperreports-java-doc.doc-base.config
deleted file mode 100644
index 9a34912..0000000
--- a/debian/libjasperreports-java-doc.doc-base.config
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libjasperreports-java-config
-Title: Config Reference for JasperReports
-Author: JasperReports developers
-Abstract: This is the Config Reference provided by the JasperReports library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjasperreports-java/config.reference.html
-Files: /usr/share/doc/libjasperreports-java/config.reference.html
diff --git a/debian/libjasperreports-java-doc.doc-base.schema b/debian/libjasperreports-java-doc.doc-base.schema
deleted file mode 100644
index b66ec27..0000000
--- a/debian/libjasperreports-java-doc.doc-base.schema
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libjasperreports-java-schema
-Title: Schema Reference for JasperReports
-Author: JasperReports developers
-Abstract: This is the Schema Reference provided by the JasperReports library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjasperreports-java/schema.reference.html
-Files: /usr/share/doc/libjasperreports-java/schema.reference.html
diff --git a/debian/libjasperreports-java-doc.install b/debian/libjasperreports-java-doc.install
deleted file mode 100644
index d623aa0..0000000
--- a/debian/libjasperreports-java-doc.install
+++ /dev/null
@@ -1,3 +0,0 @@
-dist/docs/config.reference.html /usr/share/doc/libjasperreports-java/
-dist/docs/schema.reference.html /usr/share/doc/libjasperreports-java/
-target/site/apidocs/* /usr/share/doc/libjasperreports-java/api/

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



More information about the pkg-java-commits mailing list